mastodon/app/javascript
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 Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
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 Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00