Luka Murn 53699193a2 Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb		2017-01-24 14:33:23 +01:00
..
images	Merge branch 'improved-files-handling' into 'master'	2017-01-18 11:29:40 +01:00
javascripts	Merge branch 'smart-annotations'	2017-01-24 14:33:23 +01:00
stylesheets	Merge branch 'smart-annotations'	2017-01-24 14:33:23 +01:00
tutorial_files	If file is recognized as office file, it's allowed to be any office file type.	2016-09-07 14:04:11 +02:00