mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Máté Bartus
2016-12-09 12:44:44 +01:00
parent 1de4b6d260 54751991ad
commit c5f5ab2c3f
4 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "ad5f06ceab6fa6aacad3deba71361ebc",
"content-hash": "4b562c330e947926844fefacf3b7b0a1",
"hash": "ea466b63c18f25962d5e2740543e71f2",
"content-hash": "dca7df02f1926577c88439cb709013b6",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@@ -436,16 +436,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v2.0.4",
"version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e"
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
"reference": "a9b97968bcde1c4de2a5ec6cbd06a0f6c919b46e",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
"reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"shasum": ""
},
"require": {
@@ -480,7 +480,7 @@
"pseudorandom",
"random"
],
"time": "2016-11-07 23:38:38"
"time": "2016-03-18 20:34:03"
},
{
"name": "patchwork/utf8",
@@ -2480,16 +2480,16 @@
},
{
"name": "phpunit/phpunit",
"version": "4.8.30",
"version": "4.8.31",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a534e04d0bd39c557c2881c341efd06fa6f1292a"
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a534e04d0bd39c557c2881c341efd06fa6f1292a",
"reference": "a534e04d0bd39c557c2881c341efd06fa6f1292a",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"reference": "98b2b39a520766bec663ff5b7ff1b729db9dbfe3",
"shasum": ""
},
"require": {
@@ -2548,7 +2548,7 @@
"testing",
"xunit"
],
"time": "2016-12-01 17:05:48"
"time": "2016-12-09 02:45:31"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -2892,16 +2892,16 @@
},
{
"name": "sebastian/recursion-context",
"version": "1.0.4",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "938df7a6478e72795e5f8266cff24d06e3136f2e"
"reference": "913401df809e99e4f47b27cdd781f4a258d58791"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/938df7a6478e72795e5f8266cff24d06e3136f2e",
"reference": "938df7a6478e72795e5f8266cff24d06e3136f2e",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791",
"shasum": ""
},
"require": {
@@ -2941,7 +2941,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
"time": "2016-11-15 06:55:36"
"time": "2015-11-11 19:50:13"
},
{
"name": "sebastian/version",