fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 07:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
2018-05-27 13:20:15 +02:00
..
core Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
flavours Implement client-size image resizing from upstream 2018-05-27 11:02:54 +02:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-05-27 13:20:15 +02:00
packs Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
skins Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-05-27 13:20:15 +02:00