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-06-20 02:52:34 +02:00
2020-01-23 22:00:13 +01:00
2019-03-03 22:18:23 +01:00
2019-03-03 22:18:23 +01:00
2018-10-04 12:36:53 +02:00