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
..
settings	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
confirmations_controller.rb
invitations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb	fix travis	2018-04-06 17:16:04 +02:00
sessions_controller.rb
settings_controller.rb
unlocks_controller.rb