Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.

2020-06-30 23:00:20 +02:00

..

migrate

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

2020-06-30 23:00:20 +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-30 23:00:20 +02:00

seeds.rb

Change unconfirmed user login behaviour (#11375)

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