Preparing release 2.0.14

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1c10acbeb297110b170015afe3b68a452cac4808..56f48f48559e1d73778f5d1bcbbd6668968dec05 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.0.13</version> <!-- codename: maelstrom -->
-               <date>2015-09-02</date>
+               <version>2.0.14</version> <!-- codename: maelstrom -->
+               <date>2016-10-17</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,19 +43,13 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-    <!-- WARNING: Keep both update blocks below in sync! -->
-    <instructions type="update" fromversion="2.0.12">
-        <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-        <instruction type="file">files_update.tar</instruction>
-        <instruction type="template">templates_update.tar</instruction>
-
-        <instruction type="language">language/*.xml</instruction>
-    </instructions>
-    <instructions type="update" fromversion="2.0.12 pl 1">
-        <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-        <instruction type="file">files_update.tar</instruction>
-        <instruction type="template">templates_update.tar</instruction>
-
-        <instruction type="language">language/*.xml</instruction>
-    </instructions>
+       <instructions type="update" fromversion="2.0.13">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
+               <instruction type="language">language/*.xml</instruction>
+               
+               <instruction type="option">option.xml</instruction>
+       </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index ef059e8f2de793a13f36db5b2a42f4665fdaca0a..39229a3edc62ac4985b05c22c5b81fe3147eeca7 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.13 (Maelstrom)');
+define('WCF_VERSION', '2.0.14 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());