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
..
_breadcrumbs.html.erb
_description_label.html.erb
_description_modal.html.erb
_description_modal_body.html.erb
_destroy_modal.html.erb
_destroy_user_organization_modal.html.erb
_destroy_user_organization_modal_body.html.erb
_leave_user_organization_modal.html.erb
_leave_user_organization_modal_body.html.erb
_name_modal.html.erb
_name_modal_body.html.erb
_user_dropdown.html.erb