projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cacdecf baa4743)
Merge branch 'master' of github.com:WoltLab/WCF into feature/wcfDialog/_setOption
authorMagnus Kühn <magnus.khn@gmail.com>
Sun, 7 Oct 2012 09:28:44 +0000 (11:28 +0200)
committerMagnus Kühn <magnus.khn@gmail.com>
Sun, 7 Oct 2012 09:28:44 +0000 (11:28 +0200)
1  2 
wcfsetup/install/files/js/WCF.js patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)