Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

confirmations_controller.rb

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

2019-01-02 15:36:53 +01: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

2019-03-14 17:17:20 +01:00

sessions_controller.rb

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

2018-10-30 17:52:08 +01:00