diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:12:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-31 12:12:56 +0100 |
| commit | bacb38b1615b6d65f4d5494ff243783a46365a4e (patch) | |
| tree | 4c5bbc04ffe96c3d7a56525b03a665634593e495 /build | |
| parent | c14cf0457dedfd0c1a8a72dc0571e60ccb8b03f6 (diff) | |
| parent | 3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (diff) | |
| download | forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.gz forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.bz2 forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.tar.xz forums-bacb38b1615b6d65f4d5494ff243783a46365a4e.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
phpBB/includes/constants.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 17a04d1072..b799af1a99 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-RC1" /> + <property name="prevversion" value="3.1.3-RC2" /> <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 --> |