1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 22:52:56 -05:00
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
2020-10-12 16:33:49 +02:00