Merge branch 'master' of github.com:EHER/OAuth

Conflicts: .gitignore composer.json
2012-02-09 13:03:36 -02:00
parent 9d62ccdb86 9cc377d653
commit b1cea0857a
6 changed files with 11 additions and 11 deletions
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,12 @@
    "description": "OAuth 1 PHP Library",
    "keywords": ["oauth"],
    "homepage": "https://github.com/EHER/OAuth",
-    "authors": 
-    {
-        "name": "Andy Smith",
-        "homepage": "http://term.ie/"
-    },
+    "authors":[
+        {
+            "name": "Andy Smith",
+            "homepage": "http://term.ie/"
+        }
+    ],
    "require": {
        "php": ">=5.3.0"
    }