diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-30 17:05:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-30 17:05:40 +0200 |
| commit | 94fccd8a5ed11b69e1c849d0a27c9501af861bf7 (patch) | |
| tree | 8c4afacca55b2fa02c74c4ca8a02444b724e7aa4 | |
| parent | 787784e08335ef3c8d0d2955a1687afcec0f4cf9 (diff) | |
| parent | ac4736db0887e986a322f7f92429430333525a24 (diff) | |
| download | forums-94fccd8a5ed11b69e1c849d0a27c9501af861bf7.tar forums-94fccd8a5ed11b69e1c849d0a27c9501af861bf7.tar.gz forums-94fccd8a5ed11b69e1c849d0a27c9501af861bf7.tar.bz2 forums-94fccd8a5ed11b69e1c849d0a27c9501af861bf7.tar.xz forums-94fccd8a5ed11b69e1c849d0a27c9501af861bf7.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
Conflicts:
build/build.xml
| -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 f29be5326d..f9c4f9c517 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.0-dev" /> - <property name="prevversion" value="3.0.12-RC3" /> + <property name="prevversion" value="3.0.12" /> <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" /> <!-- no configuration should be needed beyond this point --> |