scinote-web/app/assets/javascripts/users/settings
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
..
account/preferences Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
teams fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
list_toggle.js.erb refactoring 2018-04-06 14:20:40 +02:00