diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:44:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-25 19:46:24 +0200 |
| commit | f6d8183f4724808e5bc9ef1f545ddf79358adcbe (patch) | |
| tree | 6697ba66f191587f87fdc67ef5b4cd00fac6b462 /build | |
| parent | 947ab914737b906bb6e3a6d526c930d2356de504 (diff) | |
| parent | 103c929ff0daf69d61d9c5cad1d1981e4e9f6c4e (diff) | |
| download | forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.gz forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.bz2 forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.tar.xz forums-f6d8183f4724808e5bc9ef1f545ddf79358adcbe.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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
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 'build')
| -rwxr-xr-x | build/build_changelog.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build_changelog.php b/build/build_changelog.php index be0fb625ea..2d38480f9f 100755 --- a/build/build_changelog.php +++ b/build/build_changelog.php @@ -20,7 +20,7 @@ if ($_SERVER['argc'] != 2) $fixVersion = $_SERVER['argv'][1]; -$query = 'project = PHPBB3 +$query = 'project IN (PHPBB3, SECURITY) AND resolution = Fixed AND fixVersion = "' . $fixVersion . '" AND status IN ("Unverified Fix", Closed)'; |