aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-25 11:03:27 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-25 11:03:27 +0100
commitf6cc30cbfe08377c2e6f5ce332bef2ad240cb950 (patch)
tree2cd84793d5a54a4d08f956eb387a7d3a83da94cd /phpBB/install
parent23be4d8af21319644a008670c292ca19044430cd (diff)
parent0ff4a6b6a4151f25d94d7b4f651b069e21b036b2 (diff)
downloadforums-f6cc30cbfe08377c2e6f5ce332bef2ad240cb950.tar
forums-f6cc30cbfe08377c2e6f5ce332bef2ad240cb950.tar.gz
forums-f6cc30cbfe08377c2e6f5ce332bef2ad240cb950.tar.bz2
forums-f6cc30cbfe08377c2e6f5ce332bef2ad240cb950.tar.xz
forums-f6cc30cbfe08377c2e6f5ce332bef2ad240cb950.zip
Merge pull request #4245 from JoshyPHP/ticket/14381
[ticket/14381] Set the mode in message parser to "reparse" * JoshyPHP/ticket/14381: [ticket/14381] Set the mode in message parser to "reparse" [ticket/14495] Updates the version to 3.3.0-a1-dev
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rwxr-xr-xphpBB/install/phpbbcli.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 414d23623a..d0885dc620 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3',
- 'phpbb_version' => '3.2.0-b1',
+ 'phpbb_version' => '3.3.0-a1-dev',
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
'dbms' => $dbms,
'dbhost' => $dbhost,
diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php
index 6b0ac39f84..4b86f64e2a 100755
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true);
define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production');
-define('PHPBB_VERSION', '3.2.0-b2-dev');
+define('PHPBB_VERSION', '3.3.0-a1-dev');
$phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);