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

..

_account.html.haml

Change last_status_at to be a date, not datetime (#12966)

2020-01-26 23:13:48 +01:00

show.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-20 18:31:11 +01:00