1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 14:42:58 -05:00
Thibaut Girka fdd0beefa7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
2020-04-12 16:50:27 +02:00
..