aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-31 12:09:53 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-31 12:11:43 +0100
commit3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (patch)
tree6c345f16d9947668bdc440ef34db7e1cddd132af /phpBB/includes
parent67478a0f94611ba642e31549b52d83f04a4c8028 (diff)
parentbe30d8251a5c0a9ffb59f415cba7e10bbe714f68 (diff)
downloadforums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar
forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.gz
forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.bz2
forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.tar.xz
forums-3c23242bfe8666cfa7fb3ae6b55c2190f397c773.zip
Merge branch 'prep-release-3.1.3' into develop-ascraeus
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 9d86e63765..321a87b4b0 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.3-RC1');
+define('PHPBB_VERSION', '3.1.4-dev');
// QA-related
// define('PHPBB_QA', 1);