aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/constants.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-10-25 19:39:50 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-10-25 19:39:50 +0200
commit103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e (patch)
tree6a2f785684c3549c2faa20fb2f71d256d21f3c03 /phpBB/includes/constants.php
parent08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff)
parent6217a519202b7394cbad9982282ab7208f1f5ed4 (diff)
downloadforums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar
forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.gz
forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.bz2
forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.tar.xz
forums-103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e.zip
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0: [ticket/13208] Add security issues to the final changelog [prep-release-3.1.0] Prepare Changelog [prep-release-3.1.0] Update version to 3.1.0
Diffstat (limited to 'phpBB/includes/constants.php')
-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 b4bb2722c3..76c3834c91 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.0-RC7-dev');
+define('PHPBB_VERSION', '3.1.0');
// QA-related
// define('PHPBB_QA', 1);