Luke Towers
|
c047f34156
|
Merge branch 'wip/rebrand-1.0' into wip/rebrand-develop
# Conflicts:
# .github/workflows/code-quality-pr.yaml
# .github/workflows/code-quality-push.yaml
# .github/workflows/tests.yml
# README.md
# composer.json
# modules/backend/behaviors/ImportExportController.php
# modules/backend/behaviors/ReorderController.php
# modules/backend/composer.json
# modules/backend/models/ExportModel.php
# modules/cms/ServiceProvider.php
# modules/cms/classes/Asset.php
# modules/cms/classes/CmsObject.php
# modules/cms/classes/CmsObjectCollection.php
# modules/cms/composer.json
# modules/system/ServiceProvider.php
# modules/system/aliases.php
# modules/system/assets/js/lang/lang.es.js
# modules/system/assets/js/lang/lang.it.js
# modules/system/assets/js/lang/lang.zh-tw.js
# modules/system/assets/ui/storm-min.js
# modules/system/classes/CombineAssets.php
# modules/system/classes/ErrorHandler.php
# modules/system/classes/SystemController.php
# modules/system/classes/UpdateManager.php
# modules/system/composer.json
# modules/system/console/WinterFresh.php
# modules/system/console/WinterUtil.php
# modules/system/controllers/updates/_list_toolbar.htm
# modules/system/providers.php
# tests/UiTestCase.php
# tests/functional/backend/AuthTest.php
# tests/functional/phpunit.xml
# tests/unit/backend/classes/NavigationManagerTest.php
# tests/unit/cms/classes/CmsObjectTest.php
# tests/unit/cms/classes/ControllerTest.php
# tests/unit/cms/classes/ThemeTest.php
# tests/unit/plugins/database/PluginModelTest.php
# tests/unit/plugins/database/ValidationModelTest.php
# tests/unit/system/console/WinterEnvTest.php
|
2021-03-11 00:22:09 -06:00 |
|
