scinote-web/app/assets
Luka Murn beae1b05d8 Merge branch 'master' into rails-5.1
Conflicts:
	Gemfile
	Gemfile.lock
2017-09-21 08:27:38 +02:00
..
images adds images into assets folder 2017-06-29 11:04:31 +02:00
javascripts Merge branch 'master' into rails-5.1 2017-09-21 08:27:38 +02:00
stylesheets Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02: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