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

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

passwords_controller.rb

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

registrations_controller.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00

sessions_controller.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-02 08:39:52 -06:00