Jeremy Kescher 3d2fc73ecb Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js		2022-11-02 21:12:42 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:49:42 +02:00
flavours	Improve min poll options, expose value in API	2022-11-01 10:29:44 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02: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-11-02 21:12:42 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
skins	Add Oatstodon glitch flavour	2022-08-27 10:49:42 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00