Merge branch '5.4'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Dec 2021 10:25:27 +0000 (11:25 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 23 Dec 2021 10:25:27 +0000 (11:25 +0100)
1  2 
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/data/style/StyleEditor.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 3b14af6320518a2561d6a2418ebcee87d1536d9c,0bb1822ab0f5c34226e71e91ef7a8e574f13d70e..32eca1573222b9c0271298afcb7f8aa0f3e7636e
@@@ -5,8 -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.10</version>
 +              <version>5.5.0 Alpha 1</version>
-               <date>2021-11-30</date>
+               <date>2021-12-22</date>
        </packageinformation>
        
        <authorinformation>
Simple merge
Simple merge