scinote-web/app/views/reports/new
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
..
modal
_report_navigation.html.erb
_report_sidebar.html.erb