Glitch-Shrike/app/controllers/auth
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
2018-02-04 16:36:19 -06:00
..
confirmations_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb
sessions_controller.rb