Release 5.4.15 dev 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 882f9a63e6f27dd5bf6b0deffba815904431dbb9..30f493241651bd35bec75f819adf2771d7fc8b34 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>5.4.14</version>
-               <date>2022-02-15</date>
+               <version>5.4.15 dev 1</version>
+               <date>2022-03-10</date>
        </packageinformation>
        
        <authorinformation>
@@ -50,16 +50,10 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
 
-       <instructions type="update" fromversion="5.4.13">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
-               
-               <instruction type="language"/>
-       </instructions>
-       
-       <instructions type="update" fromversion="5.4.14 dev 2">
+       <instructions type="update" fromversion="5.4.14">
                <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 1c7452c2a096728c5725870e45c781687af7ca17..1dbe8833ab0007fba0630396ebe2f9d072cb0927 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -53,7 +53,7 @@ if (!@\ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-\define('WCF_VERSION', '5.4.14');
+\define('WCF_VERSION', '5.4.15 dev 1');
 
 // define current API version
 // @deprecated 5.2