5c962d77bb
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles | ||
types |