Merge branch '3.1'

silverstripe · Apr 5, 2018 · d520d9d · d520d9d
2 parents 392b4aa + 4c1303b
commit d520d9d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -11,16 +11,16 @@
         "silverstripe/cms": "^4.0",
         "silverstripe/lumberjack": "^2.0",
         "silverstripe/tagfield": "^2.0",
-        "silverstripe/assets": "^1.0@dev",
-        "silverstripe/asset-admin": "^1.0@dev"
+        "silverstripe/assets": "^1.0",
+        "silverstripe/asset-admin": "^1.0"
     },
     "require-dev": {
         "phpunit/PHPUnit": "^5.7",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.2.x-dev"
         },
         "expose": [
             "client/dist",