diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-09-30 02:03:13 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-09-30 02:03:13 +0300 |
commit | 43bd151e711d5c719cf89d2746c23da5e29dd264 (patch) | |
tree | af3c4969a64f759811a08c026b739b3d8e716435 /composer.lock | |
parent | 68fea796ef5a81cf7c5f4fb17508968ac898bb7c (diff) | |
parent | 7d115b50ecb1660175e64e4e546c72546fd56d69 (diff) |
Merge branch '2.x-dev' into 3.0-m09
Diffstat (limited to 'composer.lock')
-rw-r--r-- | composer.lock | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/composer.lock b/composer.lock index 6025211961..d1164b4d32 100644 --- a/composer.lock +++ b/composer.lock @@ -863,16 +863,16 @@ }, { "name": "piwik/referrer-spam-blacklist", - "version": "1.0.9", + "version": "1.0.10", "source": { "type": "git", "url": "https://github.com/piwik/referrer-spam-blacklist.git", - "reference": "7cce0bed292d148822ebad0eb9a286b04d27f340" + "reference": "58ecaaf7aced82ddbcc9339e1fc9e7fe9e996eb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/7cce0bed292d148822ebad0eb9a286b04d27f340", - "reference": "7cce0bed292d148822ebad0eb9a286b04d27f340", + "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/58ecaaf7aced82ddbcc9339e1fc9e7fe9e996eb8", + "reference": "58ecaaf7aced82ddbcc9339e1fc9e7fe9e996eb8", "shasum": "" }, "type": "library", @@ -881,20 +881,20 @@ "Public Domain" ], "description": "Community-contributed list of referrer spammers", - "time": "2016-07-20 19:55:33" + "time": "2016-09-28 16:10:53" }, { "name": "piwik/searchengine-and-social-list", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/piwik/searchengine-and-social-list.git", - "reference": "07046e6c6472f3cf7751f45f7b1f1657dcf920e7" + "reference": "ef1547e4e3e64d5eb174e75a3bfa3906f33e3108" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/07046e6c6472f3cf7751f45f7b1f1657dcf920e7", - "reference": "07046e6c6472f3cf7751f45f7b1f1657dcf920e7", + "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/ef1547e4e3e64d5eb174e75a3bfa3906f33e3108", + "reference": "ef1547e4e3e64d5eb174e75a3bfa3906f33e3108", "shasum": "" }, "type": "library", @@ -903,26 +903,34 @@ "Public Domain" ], "description": "Search engine and social network definitions used by Piwik", - "time": "2016-09-18 14:28:00" + "time": "2016-09-22 08:52:36" }, { "name": "psr/log", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" + "reference": "5277094ed527a1c4477177d102fe4c53551953e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", - "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", + "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", + "reference": "5277094ed527a1c4477177d102fe4c53551953e0", "shasum": "" }, + "require": { + "php": ">=5.3.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { - "psr-0": { - "Psr\\Log\\": "" + "psr-4": { + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -936,12 +944,13 @@ } ], "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ "log", "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2016-09-19 16:02:08" }, { "name": "symfony/console", @@ -1225,16 +1234,16 @@ }, { "name": "twig/twig", - "version": "v1.24.2", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7" + "reference": "f16a634ab08d87e520da5671ec52153d627f10f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7", - "reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/f16a634ab08d87e520da5671ec52153d627f10f6", + "reference": "f16a634ab08d87e520da5671ec52153d627f10f6", "shasum": "" }, "require": { @@ -1247,7 +1256,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.24-dev" + "dev-master": "1.25-dev" } }, "autoload": { @@ -1282,7 +1291,7 @@ "keywords": [ "templating" ], - "time": "2016-09-01 17:50:53" + "time": "2016-09-21 23:05:12" } ], "packages-dev": [ |