| Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. | ||
|---|---|---|
| .. | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| snowflake.rb | ||
| version.rb | ||
| Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection. | ||
|---|---|---|
| .. | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| snowflake.rb | ||
| version.rb | ||