Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.		2024-04-06 19:35:21 +02:00
..
__mocks__	…
core	Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream	2024-03-15 22:37:55 +01:00
flavours	Refactor notifications code to reduce differences with upstream (#2692)	2024-04-06 19:34:30 +02:00
fonts	…
hooks	…
icons	…
images	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
mastodon	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream	2024-04-06 19:35:21 +02:00
material-icons	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream	2024-04-06 19:35:21 +02:00
packs	Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream	2024-03-15 22:37:55 +01:00
skins	…
styles	Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream	2024-03-20 12:27:52 +01:00
svg-icons	…
types	…