Luka Murn 80323eaf67 Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle ... Conflicts: app/assets/javascripts/sidebar_toggle.js.erb		2018-05-28 12:39:24 +02:00
..
demo_files
images
javascripts	Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle	2018-05-28 12:39:24 +02:00
stylesheets