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-06-02 19:24:53 +02:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00