projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e69f2b effd1f4)
Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:17:34 +0000 (01:17 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 4 Jun 2015 23:17:34 +0000 (01:17 +0200)
1  2 
wcfsetup/install/files/js/WCF.js patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

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