1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-24 16:43:08 -05:00
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
..
2018-07-05 18:31:35 +02:00
2018-10-04 12:36:53 +02:00