Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 26 Jul 2019 09:38:04 +0000 (11:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 26 Jul 2019 09:38:04 +0000 (11:38 +0200)
commit408b9b4c0a8908635c82e81b2cb5409475d7e785
tree8f264b481c2b86a2a44d0ff00d7aab1dfc8c0bad
parente1d7914dff7941444d9f9a0f44a09b394d081c5a
parent677899c2be96d85015b890656dae96d7a79937ac
Merge branch 'master' into next
com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml