projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60f0ca8 631c57c)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 22:51:59 +0000 (00:51 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 22:51:59 +0000 (00:51 +0200)
1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

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