Preparing release 3.1.1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a0ff87f4d870e9aeec1e21b48e4f6f90162b4b45..c9a53be46e8ccf9d3addc52441a2ee883a9a61d8 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>3.1.0</version> <!-- codename: tornado -->
-               <date>2018-02-28</date>
+               <version>3.1.1</version> <!-- codename: tornado -->
+               <date>2018-03-12</date>
        </packageinformation>
        
        <authorinformation>
@@ -95,10 +95,10 @@
                <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="3.1.0 RC 4">
-               <instruction type="acpTemplate" />
-               <instruction type="file" run="standalone" />
-               <instruction type="template" />
+       <instructions type="update" fromversion="3.1.0">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" />
        </instructions>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index bf8e89b36fac04206111dd73387cd7e643b21c7d..5e8d289cfae47a402139eac3deb6e9370b172483 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0');
+define('WCF_VERSION', '3.1.1');
 
 // define current API version
 define('WSC_API_VERSION', 2018);