Merge branch 'master' of github.com:squizlabs/PHP_CodeSniffer

gsherwood · gsherwood · commit 6ac7251e9d41 · 2015-03-02T09:24:38.000+11:00
diff --git a/composer.json b/composer.json
@@ -19,6 +19,11 @@
         "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki",
         "source": "https://github.com/squizlabs/PHP_CodeSniffer"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    },
     "autoload": {
         "classmap": [
             "CodeSniffer.php",
