Thibaut Girka c1eb60642b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		2020-06-24 15:33:41 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00