diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:23:16 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-01 20:23:16 +0100 |
| commit | 9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec (patch) | |
| tree | ead1cc131830fcd208ca4e95a3e4d7582c24027d /build | |
| parent | 3c23242bfe8666cfa7fb3ae6b55c2190f397c773 (diff) | |
| parent | 7f99e1c8576ff9f4c7dda68d5d4485b29e090dd5 (diff) | |
| download | forums-9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec.tar forums-9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec.tar.gz forums-9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec.tar.bz2 forums-9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec.tar.xz forums-9f59aa59d92c6641308a0c1d51a5d4e41d37b2ec.zip | |
Merge branch 'prep-release-3.1.3' into develop-ascraeus
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 2bbd80ca92..b0a9190898 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.1.4-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 --> |