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
..
2020-07-08 23:53:56 +02:00
2019-11-13 23:02:10 +01:00
2019-04-27 03:24:09 +02:00