You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 9604766a18 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.		5 years ago
..
_account.html.haml	Change last_status_at to be a date, not datetime (#12966)	5 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago