diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:41:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 16:41:58 +0200 |
| commit | 52aafb4deafe00a81c7642f12e0c1701fc87ab67 (patch) | |
| tree | 3aeb155b42eb3fecdf057efb8c5ff48a27045880 /build | |
| parent | 9c320ccdcec9ef3d7c1650f1bc734225321780ff (diff) | |
| parent | 11242dd07d6359a725f22f3674028adfdddb49d6 (diff) | |
| download | forums-52aafb4deafe00a81c7642f12e0c1701fc87ab67.tar forums-52aafb4deafe00a81c7642f12e0c1701fc87ab67.tar.gz forums-52aafb4deafe00a81c7642f12e0c1701fc87ab67.tar.bz2 forums-52aafb4deafe00a81c7642f12e0c1701fc87ab67.tar.xz forums-52aafb4deafe00a81c7642f12e0c1701fc87ab67.zip | |
Merge branch 'prep-release-3.0.14' into 3.0.x
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
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 229f62a4c7..71fdecad49 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.15-dev" /> - <property name="prevversion" value="3.0.14-RC1" /> + <property name="prevversion" value="3.0.14" /> <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, 3.0.13, 3.0.13-PL1" /> <!-- no configuration should be needed beyond this point --> |