projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a032ebd 01866ed)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 14:37:06 +0000 (16:37 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 14:37:06 +0000 (16:37 +0200)
1  2 
com.woltlab.wcf/templates/settings.tpl patch | diff1 | diff2 | blob | history
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)