Thibaut Girka 78fa15d08f Merge branch 'master' into glitch-soc/master ...

Conflicts:
- `streaming/index.js`:
  Upstream entirely refactored it.
  Ported our changes to upstream's refactor. Hopefuly.

2020-08-11 19:19:27 +02:00

..

core

Merge branch 'master' into glitch-soc/merge-upstream

2020-07-01 19:23:14 +02:00

flavours

[Glitch] Fallback to previous, more approximative hashtag RE on older browsers

2020-08-05 13:43:32 +02:00

fonts

…

images

Merge branch 'master' into glitch-soc/merge-upstream

2020-05-13 22:11:49 +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/master

2020-08-11 19:19:27 +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

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

2020-08-02 14:30:28 +02:00