projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9f4018 a253247)
Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Thu, 2 Aug 2018 14:23:38 +0000 (16:23 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 2 Aug 2018 14:23:38 +0000 (16:23 +0200)
1  2 
wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php patch | diff1 | diff2 | blob | history
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)