From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 25 Jun 2012 15:53:00 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1054
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2cb866f7d46f899e84d0b94172b219c713f5774;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF
---

e2cb866f7d46f899e84d0b94172b219c713f5774
diff --cc wcfsetup/install/files/js/WCF.js
index 2eb8f75ae5,00d6c2e753..2c48e0b85f
mode 100644,100755..100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js