Skip to content

3.0.0-alpha.2687

3.0.0-alpha.2687: Merge remote-tracking branch 'origin/dev/2.4' into dev/3.0
@brandonkelly brandonkelly tagged this 20 Aug 22:55 
Conflicts:
	Source/craft/app/composer.json
	Source/craft/app/composer.lock
	Source/craft/app/controllers/SectionsController.php
	Source/craft/app/elementtypes/MatrixBlockElementType.php
	Source/craft/app/etc/config/defaults/general.php
	Source/craft/app/etc/et/Et.php
	Source/craft/app/etc/io/Image.php
	Source/craft/app/etc/web/UrlManager.php
	Source/craft/app/etc/web/WebApp.php
	Source/craft/app/fieldtypes/RichTextFieldType.php
	Source/craft/app/helpers/StringHelper.php
	Source/craft/app/models/EtModel.php
	Source/craft/app/records/EmailMessageRecord.php
	Source/craft/app/records/EntryDraftRecord.php
	Source/craft/app/records/EntryVersionRecord.php
	Source/craft/app/records/UserGroupRecord.php
	Source/craft/app/records/UserGroup_UserRecord.php
	Source/craft/app/records/UserPermissionRecord.php
	Source/craft/app/records/UserPermission_UserGroupRecord.php
	Source/craft/app/records/UserPermission_UserRecord.php
	Source/craft/app/resources/css/source/craft.scss
	Source/craft/app/resources/js/RichTextInput.js
	Source/craft/app/resources/js/craft.js
	Source/craft/app/resources/lib/garnish-0.1.min.js
	Source/craft/app/resources/lib/garnish-0.1.min.map
	Source/craft/app/services/ConfigService.php
	Source/craft/app/services/ElementsService.php
	Source/craft/app/services/ImagesService.php
	Source/craft/app/services/SearchService.php
	Source/craft/app/tasks/UpdateElementSlugsAndUrisTask.php
	Source/craft/app/templates/_layouts/basecp.html
	Source/craft/app/tools/AssetIndexTool.php
	Source/craft/app/vendor/composer/autoload_classmap.php
	Source/craft/app/vendor/composer/autoload_namespaces.php
	Source/craft/app/vendor/composer/autoload_psr4.php
	Source/craft/app/vendor/composer/include_paths.php
	Source/craft/app/vendor/composer/installed.json
	Source/craft/app/vendor/phpunit/php-token-stream/src/Token.php
	Source/craft/app/vendor/phpunit/php-token-stream/src/Token/Stream.php
	Source/craft/app/vendor/twig/twig/lib/Twig/Template.php
Assets 2
Loading