projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 08dc5c5 e9c647b)
Merge branch 'refs/heads/6.0'
authorOlaf Braun <info@braun-development.de>
Mon, 7 Oct 2024 12:07:54 +0000 (14:07 +0200)
committerOlaf Braun <info@braun-development.de>
Mon, 7 Oct 2024 12:07:54 +0000 (14:07 +0200)
commitea178311419f2de1d75456fa4f9a386551a8731a
tree3dfb86659c2353213bc7052df2902c781c950829tree | snapshot (tar.gz zip)
parent08dc5c504b94629e02e830ba72e9af2354c1a9d5commit | diff
parente9c647bcd6eb53b98fbbff878c35bc19c4663b32commit | diff
Merge branch 'refs/heads/6.0'

# Conflicts:
# com.woltlab.wcf/templates/__mediaSetCategoryDialog.tpl
# com.woltlab.wcf/templates/commentEditor.tpl
# com.woltlab.wcf/templates/commentResponseEditor.tpl
# ts/WoltLabSuite/Core/Component/Comment/Add.ts
# wcfsetup/install/files/acp/templates/__mediaSetCategoryDialog.tpl
# wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js
com.woltlab.wcf/templates/commentEditor.tpl diff1 | diff2 | blob | history
com.woltlab.wcf/templates/commentResponseEditor.tpl diff1 | diff2 | blob | history
ts/WoltLabSuite/Core/Component/Comment/Add.ts diff1 | diff2 | blob | history
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Comment/Add.js diff1 | diff2 | blob | history
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Clipboard.js diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)