Luka Murn ae5bccf709 Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile.lock app/datatables/repository_datatable.rb app/models/repository_cell.rb		2017-08-07 08:45:53 +02:00
..
sidebar
_about_modal.html.erb	Add "about" modal, prepare hooks, VERSION system for addons	2017-07-10 15:27:50 +02:00
_drag_n_drop_overlay.html.erb
_flash_errors.html.erb	Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]	2017-06-26 16:50:40 +02:00
_image_preview_modal.html.erb
_invite_users_modal.html.erb
_invite_users_modal_results.html.erb
_navigation.html.erb	Add "about" modal, prepare hooks, VERSION system for addons	2017-07-10 15:27:50 +02:00
_sample.html.erb
_samples.html.erb	Merge pull request #645 from ZmagoD/zd_SCI_1278	2017-06-07 15:04:24 +02:00
_secondary_navigation.html.erb	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
_sidebar.html.erb