diff --git a/build/build.xml b/build/build.xml
index aa1f00f40f..7c6a6084e5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 5df3f977e4..2b3b52f69c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -50,6 +50,7 @@
- Changelog
+ - Changes since 3.3.5
- Changes since 3.3.5-RC1
- Changes since 3.3.4
- Changes since 3.3.4-RC1
@@ -158,6 +159,48 @@
+
Changes since 3.3.5
+
Bug
+
+ - [PHPBB3-16881] - Fix ACP Statistic Table
+ - [PHPBB3-16883] - Check if var is array before using count in installer diff
+ - [PHPBB3-16887] - Update required PHP version
+ - [PHPBB3-16889] - Postgres on windows builds keep failing
+ - [PHPBB3-16892] - Duplicate entry for jav files in extension guesser
+ - [PHPBB3-16895] - 'Permission' migration tool incorrectly handles role removal
+ - [PHPBB3-16897] - sqlite3 drivers generates warnings when executing an explain query plan that fails
+ - [PHPBB3-16900] - Invalid email subject header on long topic titles
+ - [PHPBB3-16904] - Regression for topic selection in MCP in 3.3.5
+ - [PHPBB3-16908] - PHP warning on non-existent post id requests
+ - [PHPBB3-16910] - PHP warning if trying to attach orphaned files to non existent posts
+ - [PHPBB3-16914] - Missing id in memberlist email template
+ - [PHPBB3-16924] - Double escaping of config values inserted with db config
+
+
Improvement
+
+ - [PHPBB3-13508] - Support using INCLUDEJS and INCLUDECSS in twig template format
+ - [PHPBB3-16828] - Add hook event before find_users_for_notification() execute
+ - [PHPBB3-16859] - Language selection option is displayed on register if only 1 language is installed
+ - [PHPBB3-16885] - Add filters to Twig - INT and FLOAT
+ - [PHPBB3-16888] - Add the list of allowed attachment types using accept attribute
+ - [PHPBB3-16896] - Improve .gitignore visibility
+ - [PHPBB3-16898] - Do not restrict the debug error handler to the development environment
+ - [PHPBB3-16899] - Add SVG and WEBP image type to ranks, smilies and topic icons
+ - [PHPBB3-16902] - Improve search results count for MySQL
+ - [PHPBB3-16909] - Add PHP 8.2 builds to test matrix
+ - [PHPBB3-16912] - Improve mail encoding to better match RFC 2047
+ - [PHPBB3-16921] - Increase PHP requirements in the DOCS
+ - [PHPBB3-16930] - Remove redundant topic ID from last post URL
+ - [PHPBB3-16933] - Inconsistent handling of hyphen by phpBB Native search backend
+ - [PHPBB3-16939] - Wait for postgres service to start in GitHub Actions windows builds
+ - [PHPBB3-16940] - Optimize phpBB Native Search
+
+
Task
+
+ - [PHPBB3-16927] - Update plupload to latest version
+ - [PHPBB3-16928] - Update composer and composer dependencies to latest versions
+
+
Changes since 3.3.5-RC1
Bug
diff --git a/phpBB/phpbb/db/migration/data/v33x/v336rc1.php b/phpBB/phpbb/db/migration/data/v33x/v336rc1.php
new file mode 100644
index 0000000000..e3b8a9dd95
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v336rc1.php
@@ -0,0 +1,36 @@
+
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v336rc1 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return version_compare($this->config['version'], '3.3.6-RC1', '>=');
+ }
+
+ public static function depends_on()
+ {
+ return [
+ '\phpbb\db\migration\data\v33x\remove_orphaned_roles',
+ ];
+ }
+
+ public function update_data()
+ {
+ return [
+ ['config.update', ['version', '3.3.6-RC1']],
+ ];
+ }
+}