diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 20:28:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 20:28:58 +0200 |
| commit | 0cee35aeefee4cfb3af5738422f880ccb3e293f7 (patch) | |
| tree | d25b16e2e0e53b647af72921bfcaf1b2ae736dd9 /phpBB/phpbb | |
| parent | ab1c1816209d5164f1d59c7ca1f8ead7e8ec8f92 (diff) | |
| parent | 30dc3afb69fd7be0fb9b33e741df000879279a4d (diff) | |
| download | forums-0cee35aeefee4cfb3af5738422f880ccb3e293f7.tar forums-0cee35aeefee4cfb3af5738422f880ccb3e293f7.tar.gz forums-0cee35aeefee4cfb3af5738422f880ccb3e293f7.tar.bz2 forums-0cee35aeefee4cfb3af5738422f880ccb3e293f7.tar.xz forums-0cee35aeefee4cfb3af5738422f880ccb3e293f7.zip | |
Merge branch 'ticket/12429' into ticket/12429-develop
* ticket/12429:
[ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
Conflicts:
phpBB/composer.json
phpBB/composer.lock
Diffstat (limited to 'phpBB/phpbb')
0 files changed, 0 insertions, 0 deletions