You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1f7e7594db Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		5 years ago
..
core	Merge branch 'master' into glitch-soc/master	5 years ago
flavours	[Glitch] Correct margins for heading actions	5 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/master	5 years ago
packs	Admin setting to disable default follows (#12566)	5 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago