Luka Murn 84df2c81f9 Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb		2018-11-13 09:14:02 +01:00
..
sidebar
_about_modal.html.erb
_asset_link.html.erb
_drag_n_drop_overlay.html.erb
_file_preview_icon.html.erb
_file_preview_modal.html.erb
_file_wopi_controlls.html.erb
_flash_alerts.html.erb
_flash_errors.html.erb
_invite_users_modal.html.erb	Fix invite users modal to display tooltips in all variants	2018-10-02 17:55:39 +02:00
_invite_users_modal_results.html.erb
_left_menu_bar.html.erb	Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue	2018-10-06 12:56:13 +02:00
_navigation.html.erb
_sample.html.erb
_samples.html.erb
_secondary_navigation.html.erb	Merge branch 'features/export-all'	2018-11-13 09:14:02 +01:00
_sidebar.html.erb