projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5722e9a 10cd45b)
Merge branch 'formBuilder' into reactions
authorJoshua Rüsweg <josh@bastelstu.be>
Mon, 28 May 2018 17:11:20 +0000 (19:11 +0200)
committerJoshua Rüsweg <josh@bastelstu.be>
Mon, 28 May 2018 17:11:20 +0000 (19:11 +0200)
1  2 
com.woltlab.wcf/acpMenu.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 com.woltlab.wcf/acpMenu.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)