scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-03 05:29:46 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
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
..
assets Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
controllers Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
datatables
helpers Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
mailers Bugfix for notification emails 2016-10-13 12:12:28 +02:00
models Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
utilities Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
views Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00