diff --git a/build/build.xml b/build/build.xml
index 4bb43171fc..38c0502777 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 82ae9e7b0c..641c6a4846 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -50,6 +50,7 @@
- Changelog
+ - Changes since 3.3.1
- Changes since 3.3.1-RC1
- Changes since 3.3.0
- Changes since 3.3.0-RC1
@@ -151,6 +152,49 @@
+
Changes since 3.3.1
+
Bug
+
+ - [PHPBB3-16366] - Language dictionaries other than common.php are unavailable to BBCode templates in feeds
+ - [PHPBB3-16488] - ACP build_cfg_template does not support 0 as minimum value
+ - [PHPBB3-16512] - make_clickable() function does not apply custom classes
+ - [PHPBB3-16525] - Database backup generates a general error with PostgreSQL 12+
+ - [PHPBB3-16526] - Not proper handled comma-separated ACP configuration values
+ - [PHPBB3-16532] - Example post is stored as invalid XML
+ - [PHPBB3-16544] - topic_notify.txt is wrongly used for forum subscriptions
+ - [PHPBB3-16565] - Circular dependencies when cron task depends on controller.helper
+ - [PHPBB3-16568] - Problem with drop-down menu
+ - [PHPBB3-16569] - Massive margin between posts when zoomed out in browser
+ - [PHPBB3-16583] - Reset button in create search index not working
+ - [PHPBB3-16588] - Update docs links from 3.2.x to 3.3.x
+ - [PHPBB3-16593] - Undefined properties in create_search_index install task
+ - [PHPBB3-16597] - Doctum can't build docs on branches older than 3.3.x
+ - [PHPBB3-16602] - phpBB cannot be installed and/or run without iconv or mbstring
+ - [PHPBB3-16605] - SQL Registration errors do not trigger an error correctly
+
+
Improvement
+
+ - [PHPBB3-15300] - Maximum attachment filesize is nowhere mentioned
+ - [PHPBB3-16208] - No option for email for "Notify me" when a reported post is dealt with
+ - [PHPBB3-16430] - Permission ordering
+ - [PHPBB3-16472] - Remove PhantomJS UI tests
+ - [PHPBB3-16527] - Add role_exists to migration tools
+ - [PHPBB3-16533] - Add core and template events to customize UCP login keys management module
+ - [PHPBB3-16556] - Remove purposeless <Files "*"> from .htaccess
+ - [PHPBB3-16557] - Support piping tracker XML to build_changelog.php
+ - [PHPBB3-16562] - Add explanation for password complexity when resetting password
+ - [PHPBB3-16604] - Display error message if avatar upload folder is not writable
+ - [PHPBB3-16608] - Modernize README
+ - [PHPBB3-16612] - Restructure HTML for agreement, coppa, terms etc.
+
+
Task
+
+ - [PHPBB3-15594] - The deprecated AOL contact field should be removed
+ - [PHPBB3-16571] - Update s9e TextFormatter
+ - [PHPBB3-16580] - Update rendering tests to match actual Prosilver
+ - [PHPBB3-16616] - Update composer dependencies to latest versions
+
+
Changes since 3.3.1-RC1
Bug
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index 9e63a5c779..fcd8252b54 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -1,6 +1,6 @@
/**
*
-* phpBB © Copyright phpBB Limited 2003-2019
+* phpBB © Copyright phpBB Limited 2003-2020
* https://www.phpbb.com
*
* phpBB is free software. You can redistribute it and/or modify it
diff --git a/phpBB/phpbb/db/migration/data/v33x/v332rc1.php b/phpBB/phpbb/db/migration/data/v33x/v332rc1.php
new file mode 100644
index 0000000000..1126641345
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v33x/v332rc1.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 v332rc1 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return version_compare($this->config['version'], '3.3.2-RC1', '>=');
+ }
+
+ static public function depends_on()
+ {
+ return [
+ '\phpbb\db\migration\data\v33x\remove_profilefield_aol',
+ ];
+ }
+
+ public function update_data()
+ {
+ return [
+ ['config.update', ['version', '3.3.2-RC1']],
+ ];
+ }
+}