diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-12-12 15:24:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-12-12 15:24:29 +0100 |
| commit | b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09 (patch) | |
| tree | dd1a104c5e644d668010930ec5f5278568e5570f /phpBB/phpbb/language/language.php | |
| parent | 18377d63ee2f788ea9ea1ebe9274f93ac03306f9 (diff) | |
| parent | 1de3ede399e7ed189775bc86303b9427a31c3e11 (diff) | |
| download | forums-b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09.tar forums-b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09.tar.gz forums-b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09.tar.bz2 forums-b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09.tar.xz forums-b2a26ab5f41db67b4fa8016ab1f9395bf81b8a09.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to 'phpBB/phpbb/language/language.php')
0 files changed, 0 insertions, 0 deletions