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

Conflicts: .gitignore composer.json
Compuser json fixed
2012-02-09 13:03:36 -02:00 · 2012-02-09 08:33:29 -02:00 · 2012-02-09 08:33:01 -02:00
2 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *.swp
 composer.lock
 composer.phar
 composer.lock
--- a/composer.json
+++ b/composer.json
@@ -4,9 +4,6 @@
    "description": "OAuth 1 PHP Library",
    "keywords": ["oauth"],
    "homepage": "https://github.com/EHER/OAuth",
    "psr-0": {
        "OAuth": "src/"
    },
    "authors":[
        {
            "name": "Andy Smith",
Author	SHA1	Message	Date
Eher	b1cea0857a	Merge branch 'master' of github.com:EHER/OAuth Conflicts: .gitignore composer.json	2012-02-09 13:03:36 -02:00
Eher	9d62ccdb86	Compuser json fixed	2012-02-09 08:33:29 -02:00
Eher	0efb3a5dfa	Ignore some compuser and vim files	2012-02-09 08:33:01 -02:00