Merge branch 'jsPages' of https://github.com/wbb3addons/WCF into wbb3addons-jsPages
authorAlexander Ebert <ebert@woltlab.com>
Mon, 25 Jul 2011 16:25:33 +0000 (18:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 25 Jul 2011 16:25:33 +0000 (18:25 +0200)
commit5f62e53a0783b3bc893587fd80f951c20cbb36e4
tree38cab3dee7886cf24c6abf7e868794d4a94449d5
parent4307a53e79f3dd8424acc7c48fd204ee8ef56d2a
parent3712cc8cd9524b8da14ec77c2a612fb259005873
Merge branch 'jsPages' of https://github.com/wbb3addons/WCF into wbb3addons-jsPages

Conflicts:
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/js/WCF.js