mastodon/app/javascript
Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
2020-07-05 19:35:56 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
flavours [Glitch] Add customizable thumbnails for audio and video attachments 2020-07-02 17:31:09 +02:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-07-05 19:35:56 +02:00
packs Fix lock icon not being shown when locking account in profile settings (#14190) 2020-07-01 13:51:50 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-07-05 19:35:56 +02:00