diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-19 00:13:27 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-19 00:13:27 +0300 |
| commit | 1fc84146b16f178f95f7b95b089426f9c84744d9 (patch) | |
| tree | e90e0c099f387671e0ad12ef4c2160835abaeb1a /composer.lock | |
| parent | 6590128885af88b5bbfe9c0a856a224006f8e7e3 (diff) | |
| parent | 484cd7a3079f0165728b4391d1bbdd2d478e6bf0 (diff) | |
Merge branch 'master' into log-refactoring-1
Conflicts:
CHANGELOG.md
plugins/CoreConsole/Commands/CoreArchiver.php
Diffstat (limited to 'composer.lock')
| -rw-r--r-- | composer.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/composer.lock b/composer.lock index 7cc262d96d..7aaa6ff135 100644 --- a/composer.lock +++ b/composer.lock @@ -506,16 +506,16 @@ }, { "name": "piwik/cache", - "version": "0.2.1", + "version": "0.2.2", "source": { "type": "git", "url": "https://github.com/piwik/component-cache.git", - "reference": "1cbe0012f703b5462e87520ebcf76bdca89026e8" + "reference": "e6205408641cbf16b5043e0092e4414e3a4330ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/component-cache/zipball/1cbe0012f703b5462e87520ebcf76bdca89026e8", - "reference": "1cbe0012f703b5462e87520ebcf76bdca89026e8", + "url": "https://api.github.com/repos/piwik/component-cache/zipball/e6205408641cbf16b5043e0092e4414e3a4330ff", + "reference": "e6205408641cbf16b5043e0092e4414e3a4330ff", "shasum": "" }, "require": { @@ -549,7 +549,7 @@ "file", "redis" ], - "time": "2014-12-16 01:47:11" + "time": "2014-12-17 22:49:09" }, { "name": "piwik/decompress", |