projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
45f8ea4
1eba6a4
)
Merge branch 'refs/heads/master' into service-worker-notifications
author
Cyperghost
<olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:25:10 +0000
(10:25 +0200)
committer
Cyperghost
<olaf_schmitz_1@t-online.de>
Mon, 24 Jun 2024 08:25:10 +0000
(10:25 +0200)
# Conflicts:
# wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
1
2
com.woltlab.wcf/option.xml
patch
|
diff1
|
diff2
|
blob
|
history
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/event/acp/dashboard/box/PHPExtensionCollecting.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/setup/db/install.sql
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/option.xml
Simple merge
diff --cc
com.woltlab.wcf/templates/headIncludeJavaScript.tpl
Simple merge
diff --cc
wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.1.php
Simple merge
diff --cc
wcfsetup/install/files/lib/event/acp/dashboard/box/PHPExtensionCollecting.class.php
Simple merge
diff --cc
wcfsetup/setup/db/install.sql
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff