Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 29 Apr 2013 17:40:58 +0000 (19:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 29 Apr 2013 17:40:58 +0000 (19:40 +0200)
commitecf9d0171f10fea2620b1e9a4b3a3af51ae3e849
treebe4dccfbab0cf7fa169cc4d091a45e48cc04a180
parentb418da85e002568f5d660216dc2ed3a3f09e233d
parent315c6dc0d6c20cebcfeeb9d8b411f96b41aedd94
Merge branch 'master' of github.com:WoltLab/WCF
com.woltlab.wcf/template/headInclude.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/js/WCF.js