luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-16 07:00:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
..
core Fixed improper mailer import 2018-01-15 21:23:26 -08:00
flavours Port 7badad7797 to glitch frontend 2018-01-18 10:25:37 -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-19 15:22:10 -06:00
locales
mastodon Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
packs Fix mailer to use webpack core 2018-01-15 21:17:03 -08:00
skins/vanilla/win95
styles Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00