Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
flavours	Use “public.js” pack for auth pages for form validation helpers	2020-12-10 13:01:51 +01:00
fonts
images
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
packs	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00