diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-26 18:57:06 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-26 18:57:06 +0100 |
| commit | ebd5aace3fd556d6b588b07329a7eed37997045b (patch) | |
| tree | 9429e387112fa2e701eef6555d860499f3f989f2 /build | |
| parent | 4c11ea97d56e759cb3d1bc047a56f92a060f7124 (diff) | |
| parent | 5ce89ae82f7be38ef539872dc1fd360fb45c906a (diff) | |
| download | forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.gz forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.bz2 forums-ebd5aace3fd556d6b588b07329a7eed37997045b.tar.xz forums-ebd5aace3fd556d6b588b07329a7eed37997045b.zip | |
Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
[prep-release-3.0.13] Bump version numbers for 3.0.13 release
[prep-release-3.0.13] Highlight security relevant changes
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index 6b646af70b..fd3593b69d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -3,7 +3,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> <property name="newversion" value="3.0.14-dev" /> - <property name="prevversion" value="3.0.13-RC1" /> + <property name="prevversion" value="3.0.13" /> <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12" /> <!-- no configuration should be needed beyond this point --> |