mastodon-glitch/app/javascript
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
flavours Improve styling of DM view in glitch-soc 2019-09-30 17:01:16 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02: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-10-03 11:10:12 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +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 2019-10-03 11:10:12 +02:00