diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-17 18:05:17 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-17 18:05:17 +0100 |
| commit | 10f81ee79fe20baae7eb0dcced0d7a48110c3f8b (patch) | |
| tree | e46d53f88e71ea03a7eae954d25ac0c7b26ba57d /phpBB/includes/utf/data/recode_basic.php | |
| parent | 60bd1edcb5e5992e6e693d0f68db47e678f7d54a (diff) | |
| parent | 144effd74cf52a71a62e127276d78f56eab41835 (diff) | |
| download | forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.gz forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.bz2 forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.xz forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.zip | |
Merge branch 'bug/jellydoughnut/58415' into develop-olympus
* bug/jellydoughnut/58415:
Allow setting parent forums regardless of permission settings. (Bug #58415)
Conflicts:
phpBB/docs/CHANGELOG.html
Diffstat (limited to 'phpBB/includes/utf/data/recode_basic.php')
0 files changed, 0 insertions, 0 deletions