Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +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-01-02 15:36:53 +01:00
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00