projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53f6ee7 209570a)
Merge branches 'master' and 'feature/wcfDialog/_setOption' into feature/wcfDialog...
authorMagnus Kühn <magnus.khn@gmail.com>
Sat, 29 Sep 2012 13:58:22 +0000 (15:58 +0200)
committerMagnus Kühn <magnus.khn@gmail.com>
Sat, 29 Sep 2012 13:58:22 +0000 (15:58 +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)