Preparing release 3.1.0 Beta 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 132e02ae1a59d7053be937db8b9e96f22504a2a4..aac1ec0e055bf2228f1c8c95827f7e82b344a0ee 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 Beta 1</version> <!-- codename: tornado -->
-               <date>2017-09-27</date>
+               <version>3.1.0 Beta 2</version> <!-- codename: tornado -->
+               <date>2017-10-25</date>
        </packageinformation>
        
        <authorinformation>
@@ -48,13 +48,14 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="3.1.0 Alpha 4">
+       <instructions type="update" fromversion="3.1.0 Beta 1">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="sql">update_3.1.0_beta_1.sql</instruction>
-               
                <instruction type="language" />
+               
+               <instruction type="mediaProvider" />
+               <instruction type="option" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 4f1652e8d3de49a1b7e054fca805e10c2e313340..14577cd14f7f1ed9e58af0ddff37763010ac52fa 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 Beta 1');
+define('WCF_VERSION', '3.1.0 Beta 2');
 
 // define current API version
 define('WSC_API_VERSION', 2018);