Preparing release 2.1.20

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a90739e5b4e2e5ea6c8ef55e5f995508d9afc04d..70ccdff8ff03d362becc7ccfbbcb3b6120cb96c4 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.1.19</version> <!-- codename: typhoon -->
-               <date>2017-11-16</date>
+               <version>2.1.20</version> <!-- codename: typhoon -->
+               <date>2018-03-12</date>
        </packageinformation>
        
        <authorinformation>
@@ -135,9 +135,11 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.18">
+       <instructions type="update" fromversion="2.1.19">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="option">option.xml</instruction>
+               <instruction type="language">language/*.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 c2b57dac1f81017f07d402d703e74ee67118b086..dc7ae6aa414906bc4d857227100e132415837667 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.1.19 (Typhoon)');
+define('WCF_VERSION', '2.1.20 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());