mastodon/app/javascript
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
      app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
..
core Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
flavours Remove some leftover code, I guess 2018-01-23 09:20:18 +01:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
locales Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
mastodon Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
packs Fix hide and show media button on admin page (#6347) 2018-01-24 13:29:46 +01:00
skins/vanilla/win95 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
styles Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00