scinote-web/app/controllers/users
Luka Murn 9d3685f872 Merge branch 'gamification' into 'master'
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
..
confirmations_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
invitations_controller.rb Allow inviting of existing, unconfirmed users 2016-11-15 15:04:31 +01:00
omniauth_callbacks_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
passwords_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
registrations_controller.rb fixed new user registration 2016-10-17 15:10:26 +02:00
sessions_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
settings_controller.rb Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
unlocks_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00