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
..
module_archive
_clone_modal.html.erb
_dropdown_actions.html.erb
_edit_modal.html.erb
_form.html.erb	Add a smart_text_area tag & implement it throughout application	2016-11-16 17:57:01 +01:00
_move_modal.html.erb
_new_modal.html.erb
canvas.html.erb	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
module_archive.html.erb
samples.html.erb