Merge pull request #7 from stloyd/patch-1

Don't lock lexik bundle to dev version anymore
gfreeau · Jul 28, 2015 · c108294 · c108294
2 parents 974b7d3 + bacfa11
commit c108294
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -15,11 +15,16 @@
         "php": ">=5.3.3",
         "symfony/symfony": "~2.3",
         "symfony/framework-bundle": "~2.3",
-        "lexik/jwt-authentication-bundle": "1.0.*@dev"
+        "lexik/jwt-authentication-bundle": "~1.0"
     },
     "autoload": {
         "psr-0": { "Gfreeau\\Bundle\\GetJWTBundle": "" }
     },
-    "target-dir": "Gfreeau/Bundle/GetJWTBundle"
+    "target-dir": "Gfreeau/Bundle/GetJWTBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
 }