Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
..
2019-09-29 21:31:51 +02:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2020-01-12 15:49:30 +01:00