Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`

2019-11-06 14:38:28 +01:00

..

migrate

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

2019-11-06 14:38:28 +01: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

2019-11-06 14:38:28 +01:00

seeds.rb

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00