luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss
2017-12-26 22:24:19 -06:00
..
core Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
flavours Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch 2017-12-26 17:03:29 -05:00
fonts Theme: Windows 95 2017-10-26 23:22:48 -07:00
images Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-26 22:24:19 -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 2017-12-26 22:24:19 -06:00
packs Skins support 2017-11-30 19:29:47 -08:00
skins/vanilla/win95 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
styles Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-26 22:24:19 -06:00