This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
flavours	Fix clicking on the new audioplayer opening the toot in detailed view	2019-08-29 17:32:22 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00