diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
commit | 2bae9d90f860f3ccc5598420eb978cafd598451e (patch) | |
tree | b742afddcfc882de15b9c075522cee4eae680db6 /composer.json | |
parent | 41b579a9d94a05f7c0cb2e42bf7c03c2d374ed95 (diff) |
merge master => 3.0
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index fe3ca31419..b7ebee8d64 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "piwik/decompress": "~1.0", "piwik/network": "~0.1.0", "piwik/cache": "~0.2.5", - "piwik/ini": "^1.0.3", + "piwik/ini": "^1.0.6", "php-di/php-di": "^5.0.0", "psr/log": "~1.0", "monolog/monolog": "~1.11", |