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
..
images	Initial commit.	2016-02-12 16:52:43 +01:00
javascripts	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
stylesheets	Merge branch 'rich-text-formatting' into 'master'	2016-11-17 16:39:33 +01:00
tutorial_files	If file is recognized as office file, it's allowed to be any office file type.	2016-09-07 14:04:11 +02:00