diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 02:45:54 +0200 |
| commit | 947ab914737b906bb6e3a6d526c930d2356de504 (patch) | |
| tree | 254cab14a05bfd66ed5da5a85b2a45d98d995404 /phpBB/includes/constants.php | |
| parent | acf6eaf8a88415064db8de826b68d5b9b70e8c44 (diff) | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| download | forums-947ab914737b906bb6e3a6d526c930d2356de504.tar forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.gz forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.bz2 forums-947ab914737b906bb6e3a6d526c930d2356de504.tar.xz forums-947ab914737b906bb6e3a6d526c930d2356de504.zip | |
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
Diffstat (limited to 'phpBB/includes/constants.php')
| -rw-r--r-- | phpBB/includes/constants.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 126cf44842..b93b305632 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -29,7 +29,6 @@ if (!defined('IN_PHPBB')) // phpBB Version define('PHPBB_VERSION', '3.2.0-a1-dev'); - // QA-related // define('PHPBB_QA', 1); |