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
This commit is contained in:
Andreas Fischer 2013-09-30 17:05:40 +02:00
commit 94fccd8a5e

View file

@ -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 -->