aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-06 02:20:11 +0100
committerNils Adermann <naderman@naderman.de>2010-03-06 02:29:04 +0100
commit568fb83373361abb8c9f3886fee944a8d9e5f66d (patch)
tree602256c8abb312f50e2776187e1e2ce02e52a5ea /phpBB/includes
parent5d1d32a65bced82f068dbed497cc418eae5f4701 (diff)
parentc4e02a191628b4b9f7b6340f2876607663baeb5a (diff)
downloadforums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.gz
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.bz2
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.xz
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.zip
Merge branch 'master' into develop-olympus
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 f58b29d232..8d31eaba7f 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.0.7');
+define('PHPBB_VERSION', '3.0.7-PL1');
// QA-related
// define('PHPBB_QA', 1);