Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 28 Apr 2019 08:17:32 +0000 (10:17 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 28 Apr 2019 08:17:32 +0000 (10:17 +0200)
commit135ef37a90b0d8afb3d4cc51bbd77c9bfeb944eb
tree6245193c5ff938b439c86f55cdb8d5ca7f1d815f
parent000c0c8a26491708b2af995bdd6f0e627cc75161
parente0deb93fa2c765db3b9a8aac15b1fe9f5b19bd8b
Merge branch 'master' into next
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
wcfsetup/install/files/lib/data/tag/TagCloudTag.class.php
wcfsetup/install/files/lib/data/user/option/UserOption.class.php
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
wcfsetup/install/files/lib/system/tagging/TagCloud.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml