Merge branch 'release/0.3.3'. Release version 0.3.3

Conflicts:
	composer.json
This commit is contained in:
Alex Bilbie 2012-12-10 21:31:58 +00:00
commit fdfe80289a
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
{ {
"name": "lncd/oauth2", "name": "lncd/oauth2",
"description": "OAuth 2.0 Framework", "description": "OAuth 2.0 Framework",
"version": "0.3.2", "version": "0.3.3",
"homepage": "https://github.com/lncd/OAuth2", "homepage": "https://github.com/lncd/OAuth2",
"license": "MIT", "license": "MIT",
"require": { "require": {
@ -29,7 +29,7 @@
{ {
"name": "Alex Bilbie", "name": "Alex Bilbie",
"email": "hello@alexbilbie.com", "email": "hello@alexbilbie.com",
"homepage": "http://www.httpster.org", "homepage": "http://www.alexbilbie.com",
"role": "Developer" "role": "Developer"
} }
], ],

View File

@ -297,7 +297,7 @@ class Server
$typeId, $typeId,
$authCode, $authCode,
$accessToken, $accessToken,
'request' 'requested'
); );
} else { } else {
@ -315,7 +315,7 @@ class Server
$authCode, $authCode,
null, null,
null, null,
'request' 'requested'
); );
// Add the scopes // Add the scopes