Merge remote-tracking branch 'origin/next-lantia' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:00:46 +0000 (12:00 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:00:46 +0000 (12:00 +0100)
commite7569755f71d77d2424b57fc278e9e38890cf83d
treedb361293f08e73626e601e153c2f9bc5bbd5d4d4
parent39abe1928c4beab8336266d54520a5987c39b4aa
parent738b3932c0cdeb11542bb0b355c828827e38a56d
Merge remote-tracking branch 'origin/next-lantia' into next-lantia

# Conflicts:
# com.woltlab.wcf/acpMenu.xml
# wcfsetup/install/files/lib/system/request/LinkHandler.class.php
19 files changed:
com.woltlab.wcf/acpMenu.xml
wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
wcfsetup/install/files/lib/data/box/Box.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
wcfsetup/install/files/lib/data/page/Page.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
wcfsetup/install/files/lib/system/box/BoxHandler.class.php
wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/request/ControllerMap.class.php
wcfsetup/install/files/lib/system/request/LinkHandler.class.php
wcfsetup/install/files/lib/system/request/route/DynamicRequestRoute.class.php
wcfsetup/install/files/lib/util/exception/CryptoException.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/db/install.sql