Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
2020-07-15 15:32:40 +02:00
..
2019-12-19 07:39:08 +09:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00