Merge branch '3.x' of github.com:lucadegasperi/oauth2-server-laravel into 3.x

lucadegasperi · lucadegasperi · commit 5678b088fb9c · 2014-12-04T08:47:58.000+01:00
diff --git a/composer.json b/composer.json
@@ -42,11 +42,6 @@
             "tests/integration/DBTestCase.php"
         ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.0.x-dev"
-        }
-    },
     "minimum-stability": "dev",
     "license": "MIT"
 }

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,6 @@`
`42`	`42`	`"tests/integration/DBTestCase.php"`
`43`	`43`	`]`
`44`	`44`	`},`
`45`		`- "extra": {`
`46`		`- "branch-alias": {`
`47`		`- "dev-master": "4.0.x-dev"`
`48`		`- }`
`49`		`- },`
`50`	`45`	`"minimum-stability": "dev",`
`51`	`46`	`"license": "MIT"`
`52`	`47`	`}`