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 612158f4f6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		4 years ago
..
core	Adapt 2FA changes to glitch-soc's theming system	4 years ago
flavours	[Glitch] Update Tesseract.js	4 years ago
fonts	Theme: Windows 95	7 years ago
images	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
packs	Adapt 2FA changes to glitch-soc's theming system	4 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	7 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago