projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e4f71 63310a7)
Merge branch 'refs/heads/2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 6 Jul 2014 17:42:29 +0000 (19:42 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 6 Jul 2014 17:42:29 +0000 (19:42 +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)