Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.		2020-07-07 15:58:45 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +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-07-07 15:58:45 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00