You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
      app/javascript/styles/mastodon/components.scss
7 years ago
..
core Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
flavours Remove some leftover code, I guess 7 years ago
fonts Theme: Windows 95 7 years ago
images Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
locales Javascript intl8n flavour support 7 years ago
mastodon Merge remote-tracking branch 'tootsuite/master' into merge-upstream 7 years ago
packs Fix hide and show media button on admin page (#6347) 7 years ago
skins/vanilla/win95 Ruby intl8n for themes 7 years ago
styles Merge remote-tracking branch 'tootsuite/master' into merge-upstream 7 years ago