scinote-web/app/views/shared
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
sidebar
_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
_sidebar.html.erb