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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

core

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

flavours

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

2020-01-20 18:31:11 +01:00

fonts

…

images

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

2020-01-24 14:37:06 +01: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

2020-01-24 14:37:06 +01:00

packs

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

2020-01-20 18:31:11 +01: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-01-24 14:37:06 +01:00