Merge branch 'release/0.3.5'

Version bump
Merge branch 'hotfix/resourceConfig' into develop
2025-05-31 14:12:07 +05:30 · 2012-12-12 11:44:56 +00:00 · 2012-12-12 11:44:51 +00:00 · 2012-12-12 11:44:04 +00:00 · 2012-12-12 11:43:11 +00:00 · 2012-12-12 11:43:01 +00:00
2 changed files with 2 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {
--- a/src/Oauth2/Resource/Server.php
+++ b/src/Oauth2/Resource/Server.php
@@ -75,7 +75,7 @@ class Server
    public function __construct($options = null)
    {
        if ($options !== null) {
-            $this->config = array_merge($this->config, $options);
+            $this->_config = array_merge($this->_config, $options);
        }
    }
Author	SHA1	Message	Date
Alex Bilbie	41d8a1efa3	Merge branch 'release/0.3.5'	2012-12-12 11:44:56 +00:00
Alex Bilbie	4928221b49	Version bump	2012-12-12 11:44:51 +00:00
Alex Bilbie	8131d5be90	Merge branch 'hotfix/resourceConfig' into develop	2012-12-12 11:44:04 +00:00
Alex Bilbie	a948335e45	Merge branch 'hotfix/resourceConfig'	2012-12-12 11:43:11 +00:00
Alex Bilbie	aa978d3581	Fix variable name	2012-12-12 11:43:01 +00:00
Alex Bilbie	b1d91f33cf	Merge branch 'release/0.3.4' into develop	2012-12-11 15:33:20 +00:00