updates from master + alpha testers

jordikroon · Oct 24, 2015 · f15f268 · f15f268
1 parent a4cd92f
commit f15f268
Show file tree

Hide file tree

Showing 14 changed files with 217 additions and 1,743 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 phpunit.xml
+composer.lock
 vendor
 examples/testfile-small.txt
 examples/testfile.txt

diff --git a/README.md b/README.md
@@ -23,8 +23,7 @@ See the examples/ directory for examples of the key client features. You can
 view them in your browser by running the php built-in web server.
 
 ```
-$ cd examples/
-$ php -S localhost:8000
+$ php -S localhost:8000 -t examples/
 ```
 
 And then browsing to the host and port you specified

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=5.4",
-        "google/auth": "v0.2-alpha",
+        "google/auth": "v0.3",
         "monolog/monolog": "^1.17",
         "phpseclib/phpseclib": "~2.0",
         "guzzlehttp/guzzle": "5.2.*"
@@ -28,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }