Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 11 Feb 2015 15:23:15 +0000 (16:23 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 11 Feb 2015 15:23:15 +0000 (16:23 +0100)
commit3d1b6923cd2cfd666d0714a9b1a051da64c8734e
treea2d3b31748d6e09d20f7ed38c13db6fd893156fe
parent3f2f771dbb7cb9c07562ebe96ca6bff6f59976bb
parentdc0015abe059b7d563843a68fbcc6f1e923ec1c2
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/system/WCF.class.php