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-11-13 23:02:10 +01:00
2019-04-27 03:24:09 +02:00
2020-01-25 05:23:05 +01:00
2020-01-23 22:00:13 +01:00