e859334b33
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |
e859334b33
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |