mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
This commit is contained in:
Joas Schilling
2014-10-23 02:45:54 +02:00
parent acf6eaf8a8 08f365236a
commit 947ab91473
5 changed files with 105 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/constants.php
View File

@@ -29,7 +29,6 @@ if (!defined('IN_PHPBB'))
// phpBB Version
define('PHPBB_VERSION', '3.2.0-a1-dev');
// QA-related
// define('PHPBB_QA', 1);