Claire 4ef66d6538 Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.		2023-10-24 20:31:20 +02:00
..
core	Fix `@rails/ujs` imports	2023-10-24 20:23:31 +02:00
flavours	Fix `@rails/ujs` imports	2023-10-24 20:23:31 +02:00
fonts	…
hooks	…
icons	…
images	…
mastodon	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream	2023-10-24 20:31:20 +02:00
packs	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
skins	…
styles	Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
types	…