This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
flavours Fixes columns scrolling to top when opening media modal 2018-09-03 14:24:10 +02:00
fonts
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +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-08-31 19:10:57 +02:00