Thibaut Girka b9f314bba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		2019-03-26 16:02:54 +01:00
..
core	…
flavours	[Glitch] Add custom closed registrations message to landing page when set	2019-03-26 16:01:59 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00