Merge branch 'refs/heads/develop' into feature/no-inject-server

Conflicts:
	src/League/OAuth2/Server/Grant/GrantTrait.php
This commit is contained in:
Alex Bilbie 2013-12-05 20:28:31 +00:00
commit 0db8850e81

View File

@ -40,6 +40,17 @@ trait GrantTrait {
return $this->identifier;
}
/**
* Return the identifier
* @param string $identifier
* @return self
*/
public function setIdentifier($identifier)
{
$this->identifier = $identifier;
return $this;
}
/**
* Return the response type
* @return string
@ -71,4 +82,4 @@ trait GrantTrait {
return $this;
}
}
}