mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 08:47:45 +02:00
Merge branch 'develop-ascraeus' into develop
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:
@@ -29,7 +29,6 @@ if (!defined('IN_PHPBB'))
|
||||
|
||||
// phpBB Version
|
||||
define('PHPBB_VERSION', '3.2.0-a1-dev');
|
||||
|
||||
// QA-related
|
||||
// define('PHPBB_QA', 1);
|
||||
|
||||
|
Reference in New Issue
Block a user