Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
|---|---|---|
| .. | ||
| edit.html.haml | ||
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. |
||
|---|---|---|
| .. | ||
| edit.html.haml | ||