Merge branch '3.0' into 3.1

* 3.0: [ci] Upgrade phpunit wrapper deps
2016-06-29 15:03:37 +02:00 · 2016-06-29 15:03:37 +02:00 · 0439837729
parent e770e2ec1a f3b2324c20
commit 0439837729
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -11,7 +11,7 @@
 */

 // Please update when phpunit needs to be reinstalled with fresh deps:
-// Cache-Id-Version: 2016-03-25 09:45 UTC
+// Cache-Id-Version: 2016-06-29 13:45 UTC

 use Symfony\Component\Process\ProcessUtils;