Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 10 Dec 2014 02:18:40 +0000 (03:18 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 10 Dec 2014 02:18:40 +0000 (03:18 +0100)
commitea2c3591bb8c84ba2fd289872c1e0bc386f7cb0b
treef81130e52e2e156fe64a85be12535241d3ee27f3
parent0d42c1c1cf742f7f02a31231461501554f3d3102
parent281ac3625864eb5f037395376b4b40fe69f789da
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
wcfsetup/install/files/js/WCF.js