Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.		2024-05-01 18:56:48 +02:00
..
__mocks__	…
flavours	[Glitch] Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`)	2024-05-01 18:43:37 +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 '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream	2024-05-01 18:56:48 +02:00
material-icons	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
packs	Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream	2024-05-01 17:26:21 +02:00
skins	Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`	2024-04-30 21:03:04 +02:00
styles	Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
svg-icons	…
types	…