projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41abef8 2e768ae)
Merge remote-tracking branch 'origin/next' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Sun, 10 Jun 2018 13:52:36 +0000 (15:52 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Sun, 10 Jun 2018 13:52:36 +0000 (15:52 +0200)
1  2 
CodeSniff/WCF/ruleset.xml 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 CodeSniff/WCF/ruleset.xml
Simple merge
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)