scinote-web/app/assets/stylesheets/themes
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
2018-04-12 13:16:46 +02:00
..
main_navigation.scss refactor typography 2018-03-30 09:54:57 +02:00
menu_bar.scss refactor typography 2018-03-30 09:54:57 +02:00
repositories.scss fixes hound 2018-04-04 16:40:07 +02:00
scinote.scss Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00