projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e72c63
decb1f6
)
Merge branch '6.0' into 6.1
author
Alexander Ebert
<ebert@woltlab.com>
Fri, 25 Oct 2024 09:25:09 +0000
(11:25 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Fri, 25 Oct 2024 09:25:09 +0000
(11:25 +0200)
1
2
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
Simple merge
diff --cc
wcfsetup/install/files/lib/system/worker/SitemapRebuildWorker.class.php
Simple merge