69212ed0ad
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates |
69212ed0ad
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
mastodon | ||
paperclip | ||
tasks | ||
templates |