projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fa2488 8f15154)
Merge branch 'master' into mfa-meta
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 20 Nov 2020 10:29:25 +0000 (11:29 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 20 Nov 2020 10:29:25 +0000 (11:29 +0100)
For the bug fix in the email templates.

1  2 
syncTemplates.json patch | diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/WCFACP.class.php 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
wcfsetup/setup/db/install.sql patch | diff1 | diff2 | blob | history

diff --cc syncTemplates.json
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)