projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bff27f 9917442)
Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 14 Sep 2018 12:39:08 +0000 (14:39 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 14 Sep 2018 12:39:08 +0000 (14:39 +0200)
1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

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