Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
authorMarcel Werk <burntime@woltlab.com>
Thu, 7 Jan 2016 18:31:37 +0000 (19:31 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 7 Jan 2016 18:31:37 +0000 (19:31 +0100)
commitdeb445e7d97d1a849c56e8be88382fb02374fcdb
tree6dc76b9b068b95b48ae1d9b7e4cd5dc608283b00
parent487db634a17368ab7f3597016d806cf50eb6dd65
parent3ce931f5e6411998cf2a2095a12e16df3d117691
Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
wcfsetup/install/files/lib/data/box/Box.class.php
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/setup/db/install.sql