diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-31 02:10:11 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-31 02:11:20 +0300 |
| commit | 1cd924d0371a2271798279b78e30585f4c7a80d9 (patch) | |
| tree | d459921c818bda0a3f23fc53b9fcb60f92be3ced /composer.json | |
| parent | f5b6b4ccb021a3b082e578fc9a42c715985d1fae (diff) | |
| parent | bca9fdab124fb27aa0a7c04da768011fba26589f (diff) | |
Merge branch 'master' into php-di
Conflicts:
composer.json
composer.lock
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/composer.json b/composer.json index 7120659b8d..91fffba957 100644 --- a/composer.json +++ b/composer.json @@ -44,6 +44,7 @@ "mustangostang/spyc": "~0.5.0", "piwik/device-detector": "~2.0", "piwik/decompress": "~0.1.1", + "piwik/network": "~0.1.0", "mnapoli/php-di": "5.0.x-dev" }, "require-dev": { |