scinote-web/app/views/result_comments
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
..
_comment.html.erb Add individual permission checks in dropdowns 2016-08-25 13:51:50 +02:00
_index.html.erb Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
_list.html.erb Add edit/delete result comment functionality 2016-08-25 13:51:31 +02:00
new.html.erb Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00