aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
commit1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (patch)
treea0dc5c3f4884c47ba7d3e426400540842b2802bb /phpBB/includes
parent1ad64f89b817a42722b522f4a763424eea3b5a5f (diff)
parent40354f1f909168ffafc332b74af15f9347c4e530 (diff)
downloadforums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.gz
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.bz2
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.xz
forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.zip
Merge branch 'prep-release-3.1.10' into 3.1.x
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 cafb819ffc..23839e3d9a 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.11-dev');
+define('PHPBB_VERSION', '3.1.10');
// QA-related
// define('PHPBB_QA', 1);