mastodon/app/javascript
Thibaut Girka aaf98669a5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
2019-02-01 16:12:20 +01:00
..
core Port a few public.js changes from upstream, move some code around 2019-01-10 18:45:17 +01:00
flavours Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-02-01 16:12:20 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01: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 2019-02-01 16:12:20 +01:00