You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Alexander Makarov
b62077d581
Merge branch 'master' into 2.1
# Conflicts:
# composer.lock
# framework/UPGRADE.md
# framework/classes.php
# framework/console/controllers/BaseMigrateController.php
# framework/console/controllers/MigrateController.php
# framework/db/QueryBuilder.php
# framework/db/pgsql/QueryBuilder.php
# framework/log/Target.php
# framework/rest/IndexAction.php
# framework/web/JsonResponseFormatter.php
# framework/web/Request.php
# framework/web/User.php
# tests/framework/console/controllers/BaseMessageControllerTest.php
# tests/framework/db/ActiveRecordTest.php
# tests/framework/db/GetTablesAliasTestTrait.php
# tests/framework/di/InstanceTest.php
# tests/framework/filters/RateLimiterTest.php
# tests/framework/filters/auth/AuthTest.php
# tests/framework/helpers/ArrayHelperTest.php
# tests/framework/helpers/HtmlTest.php
# tests/framework/helpers/JsonTest.php
# tests/framework/i18n/MessageFormatterTest.php
# tests/framework/validators/ExistValidatorTest.php
# tests/framework/validators/FileValidatorTest.php
# tests/framework/web/AssetBundleTest.php
# tests/framework/web/DbSessionTest.php
# tests/framework/widgets/ActiveFormTest.php
|
7 years ago |
| .. |
|
Container.php
|
Merge branch 'master' into 2.1
|
7 years ago |
|
Instance.php
|
Merge branch 'master' into '2.1'
|
7 years ago |
|
NotInstantiableException.php
|
Added php-cs-fixer coding standards validation to Travis CI (#14100)
|
7 years ago |
|
ServiceLocator.php
|
Merge branch 'master' into '2.1'
|
7 years ago |
