diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:24:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:24:32 +0100 |
| commit | 6e2838a4cabc6e7874ff1a72af2d3eb4f5361428 (patch) | |
| tree | df1c4c097397824f33e9be21ca7ef4b7e2a948dc /build | |
| parent | Merge pull request #3352 from VSEphpbb/ticket/10388 (diff) | |
| parent | Merge branch 'prep-release-3.1.3' into develop-ascraeus (diff) | |
| download | phpbb-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar.gz phpbb-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.tar.bz2 phpbb-6e2838a4cabc6e7874ff1a72af2d3eb4f5361428.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
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 b799af1a99..d2e9618ef8 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.2.0-a1-dev" /> - <property name="prevversion" value="3.1.3-RC2" /> + <property name="prevversion" value="3.1.3" /> <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" /> <!-- no configuration should be needed beyond this point --> |