diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:57:37 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:59:14 +0300 |
| commit | 524565eb40d8c20080d345be80610ccdea11d8af (patch) | |
| tree | e88043f856dde04ce4a43e1b5e904b1dbe2ad7bc /composer.json | |
| parent | c8c433b9d3afeaca87c3d85b184a2b29f5002d38 (diff) | |
| parent | 719114577f0a5a7962e37a250db3a8d76a1809b8 (diff) | |
Merge branch 'master' into log-refactoring-1
Conflicts:
composer.json
composer.lock
config/global.php
core/Container/StaticContainer.php
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 6194fcb47a..d9a930ba15 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "support": { "forum": "http://forum.piwik.org/", "issues": "https://github.com/piwik/piwik/issues", - "wiki": "http://dev.piwik.org/", + "wiki": "https://github.com/piwik/piwik/wiki", "source": "https://github.com/piwik/piwik" }, "autoload": { @@ -46,6 +46,7 @@ "piwik/decompress": "~0.1.1", "piwik/network": "~0.1.0", "mnapoli/php-di": "5.0.x-dev", + "piwik/cache": "~0.2", "psr/log": "~1.0", "monolog/monolog": "~1.11", "symfony/monolog-bridge": "~2.5" |