mastodon/app/javascript
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
flavours Fix public page CSS to match upstream's changes 2020-06-26 13:45:40 +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-06-30 23:00:20 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00