projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28854f5 27334d4)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:40:29 +0000 (21:40 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 21 Dec 2015 20:40:29 +0000 (21:40 +0100)
1  2 
wcfsetup/install/files/js/WCF.ImageViewer.js patch | diff1 | diff2 | blob | history
wcfsetup/install/files/js/WCF.js patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

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