| Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. | ||
|---|---|---|
| .. | ||
| extend.rb | ||
| scoped_settings.rb | ||
| Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. | ||
|---|---|---|
| .. | ||
| extend.rb | ||
| scoped_settings.rb | ||