projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 629249e 3efc400)
Merge branch '5.3'
authorjoshuaruesweg <ruesweg@woltlab.com>
Tue, 8 Dec 2020 12:57:21 +0000 (13:57 +0100)
committerjoshuaruesweg <ruesweg@woltlab.com>
Tue, 8 Dec 2020 12:57:21 +0000 (13:57 +0100)
1  2 
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabCaret.js 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)