Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/application_controller.rb

Changed instance theme selection by instance flavour selection.

2018-08-24 15:10:34 +02:00

..

confirmations_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

omniauth_callbacks_controller.rb

CAS + SAML authentication feature (#6425)

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

passwords_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

registrations_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

sessions_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-24 15:10:34 +02:00