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
_drag_n_drop_overlay.html.erb
_flash_errors.html.erb
_image_preview_modal.html.erb
_invite_users_modal.html.erb
_invite_users_modal_results.html.erb
_navigation.html.erb
_sample.html.erb
_samples.html.erb
_secondary_navigation.html.erb	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
_sidebar.html.erb