diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-07-11 22:20:42 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-07-11 22:20:42 -0700 |
| commit | b395c9e2789de6a54bd8d24ad3a1fd3c6659c12f (patch) | |
| tree | bf9f945546243accfaf5e1774332d317e15b5224 /composer.json | |
| parent | 01c4d995d35958c64e65feb8193c5ce2e0845758 (diff) | |
| parent | ef6b991d63f6c170a1886d66a27f8387ef7818e6 (diff) | |
Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 05ac003714..6e7f24b451 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,10 @@ ], "require": { "php": ">=5.5.0", - "datto/protobuf-php": "dev-master", - "google/auth": "v0.7" + "datto/protobuf-php": "dev-master" + }, + "require-dev": { + "google/auth": "v0.9" }, "autoload": { "psr-4": { |