Merge branch 'develop' of github.com:Rudloff/alltube into develop

This commit is contained in:
Pierre Rudloff 2017-03-19 12:27:27 +01:00
commit 962d019972

10
composer.lock generated
View file

@ -1589,16 +1589,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.7.15",
"version": "5.7.16",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "b99112aecc01f62acf3d81a3f59646700a1849e5"
"reference": "dafc78e2a7d12139b0e97078d1082326bd09363d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b99112aecc01f62acf3d81a3f59646700a1849e5",
"reference": "b99112aecc01f62acf3d81a3f59646700a1849e5",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dafc78e2a7d12139b0e97078d1082326bd09363d",
"reference": "dafc78e2a7d12139b0e97078d1082326bd09363d",
"shasum": ""
},
"require": {
@ -1667,7 +1667,7 @@
"testing",
"xunit"
],
"time": "2017-03-02T15:22:43+00:00"
"time": "2017-03-15T13:02:34+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",