diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-29 17:15:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-29 17:15:56 +0200 |
| commit | 9cd0295dd87fd8920b473a290830b58ec3a9877e (patch) | |
| tree | 44699b6ea75b95115f107edd4a0c4ae1ce3a693a /phpBB/config/default | |
| parent | 95add752b74bf8c24f88e81799aa0f43341ea90b (diff) | |
| parent | 1ad09d9c8b40310698648e1064f186c2670ad880 (diff) | |
| download | forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.gz forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.bz2 forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.tar.xz forums-9cd0295dd87fd8920b473a290830b58ec3a9877e.zip | |
Merge branch 'prep-release-3.1.4' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/config/default')
0 files changed, 0 insertions, 0 deletions