aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-02-05 22:25:45 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-02-05 22:25:45 +0100
commit344baf91809bbfd5a224191e13472b94f77b421c (patch)
tree3beda4c0c83da67a6593928d1c7c88cfe8f0317a /phpBB/includes
parent32bc5d72e424881109e0c86b716e8bd77e41bffc (diff)
parentbf93e20afb7a047dbdc848e808feac5788752ff7 (diff)
downloadforums-344baf91809bbfd5a224191e13472b94f77b421c.tar
forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.gz
forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.bz2
forums-344baf91809bbfd5a224191e13472b94f77b421c.tar.xz
forums-344baf91809bbfd5a224191e13472b94f77b421c.zip
Merge branch 'prep-release-3.1.0-a3' into develop
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/constants.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 855b6ff187..374b8ff7f7 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-a3-dev');
+define('PHPBB_VERSION', '3.1.0-a4-dev');
// QA-related
// define('PHPBB_QA', 1);