Luka Murn 9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix ... Conflicts: app/views/projects/index.html.erb		2018-06-12 17:44:42 +02:00
..
demo_files
images
javascripts	remove unused code	2018-06-11 14:49:03 +02:00
stylesheets	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix	2018-06-12 17:44:42 +02:00