scinote-web/app/views/reports
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
..
elements Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
new Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
index.html.erb Fix issue with pop-up windows and turbolinks [SCI-463] 2016-10-17 14:25:54 +02:00
new.html.erb remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
report.pdf.erb