Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss		2016-11-17 16:39:33 +01:00
..
_element_controls.html.erb
_experiment_element.html.erb
_my_module_activity_element.html.erb
_my_module_element.html.erb
_my_module_samples_element.html.erb
_new_element.html.erb
_project_header_element.html.erb
_result_asset_element.html.erb
_result_comments_element.html.erb
_result_table_element.html.erb
_result_text_element.html.erb
_step_asset_element.html.erb
_step_checklist_element.html.erb
_step_comments_element.html.erb
_step_element.html.erb
_step_table_element.html.erb