commit: 446c0459c92055a215baba6009f8515068cb019d
Author: Marc Alexander <admin <AT> m-a-styles <DOT> de>
AuthorDate: Sat Apr 20 22:16:06 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 22:16:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/forums.git/commit/?id=446c0459
Merge branch 'prep-release-3.2.6' into 3.2.x
build/build.xml | 2 +-
phpBB/docs/CHANGELOG.html | 65 ++++++++++++++++++++++
phpBB/includes/constants.php | 2 +-
phpBB/install/convertors/convert_phpbb20.php | 2 +-
phpBB/install/phpbbcli.php | 2 +-
phpBB/install/schemas/schema_data.sql | 2 +-
.../data/v32x/{v325rc1.php => v326rc1.php} | 9 +--
phpBB/styles/prosilver/style.cfg | 4 +-
8 files changed, 77 insertions(+), 11 deletions(-)
