Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 15:05:56 +0000 (17:05 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 15:05:56 +0000 (17:05 +0200)
commitcdb6ce619cbfe8e128c6ea5f33505319dd7fd8d5
treea2cdfd4e2c4eb49242edf0371da88cf780cd81b1
parent4b7266c0a6cf4b0fa62585be8e0a7be483df0d1c
parent6ac55a064f10124035a433933f62ced6cde40e74
Merge branch 'master' into next

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Combined.min.js
wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
wcfsetup/install/files/lib/system/WCF.class.php
com.woltlab.wcf/objectTypeDefinition.xml
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/style/layout.less