Luka Murn d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix ... Conflicts: app/assets/javascripts/samples/sample_datatable.js		2016-12-12 09:57:37 +01:00
..
images	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +01:00
javascripts	Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix	2016-12-12 09:57:37 +01:00
stylesheets	Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix	2016-12-12 09:57:37 +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