Glitch-Shrike/app
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
..
chewy Fix searchable status without explicitly mentioning it (#13829) 2020-05-23 05:47:25 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
mailers Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
policies
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00