Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Mon, 4 May 2015 12:00:33 +0000 (14:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 4 May 2015 12:00:33 +0000 (14:00 +0200)
commit4efd3bd530f8f77635c5094f6fbb5afc4ddbdb8b
tree907da678cb3b1fc97e7a1c850d8a41f0376ca36a
parentc318ad3b11a577c935d510f9261857ebbdb5675b
parent196c5c513e56b5f4e982ff24bdfea583d4ef3196
Merge branch 'next' of github.com:WoltLab/WCF into next

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