Jeremy Kescher 499eecf5a0 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-10-03 17:39:52 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2022-10-03 17:39:52 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
icons	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge remote-tracking branch 'upstream/main' into develop	2022-10-03 17:39:52 +02:00
packs	Add ability to select all accounts matching search for batch actions (#19053)	2022-08-25 23:33:34 +02:00
skins	Add Oatstodon glitch flavour	2022-08-27 10:49:42 +02:00
styles	Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"	2022-10-02 18:46:28 +02:00