Thibaut Girka 9c34090db8 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/process_mentions_service.rb`:
  glitch-soc local-only handling, ported upstream changes

2020-10-26 15:48:16 +01:00

..

core

[Glitch] Change how CDN_HOST is passed down to make assets build reproducible

2020-10-21 21:28:47 +02:00

flavours

[Glitch] Fix strings that could not be translated

2020-10-21 21:49:46 +02:00

fonts

…

images

…

locales

…

mastodon

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

2020-10-26 15:48:16 +01:00

packs

[Glitch] Change how CDN_HOST is passed down to make assets build reproducible

2020-10-21 21:28:47 +02:00

skins

…

styles

…