scinote-web/app/views/reports/elements
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1
Conflicts:
	app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
..
_element_controls.html.erb
_experiment_element.html.erb
_my_module_activity_element.html.erb
_my_module_element.html.erb
_my_module_repository_element.html.erb
_my_module_result_asset_element.html.erb
_my_module_result_table_element.html.erb
_my_module_result_text_element.html.erb
_my_module_samples_element.html.erb
_my_module_step_element.html.erb
_new_element.html.erb
_project_header_element.html.erb
_result_comments_element.html.erb
_step_asset_element.html.erb
_step_checklist_element.html.erb
_step_comments_element.html.erb
_step_table_element.html.erb