mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 14:16:12 +01:00
Code Issues Projects Releases Wiki Activity
24b6e4121f
mastodon/app/javascript
History
David Yip 24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream 
Merge upstream
2018-01-20 16:37:35 -06:00
..
core Fixed improper mailer import 2018-01-15 21:23:26 -08:00
flavours Merge pull request #342 from glitch-soc/merge-upstream 2018-01-20 16:37:35 -06:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-20 10:45:43 -06:00
locales Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
mastodon Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-20 10:45:43 -06:00
packs Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
skins/vanilla/win95 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
styles Eliminate stray conflict markers. 2018-01-20 10:46:43 -06:00