projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2771de
7685f6d
)
Merge branch '5.5'
author
Tim Düsterhus
<duesterhus@woltlab.com>
Tue, 7 Jun 2022 10:01:40 +0000
(12:01 +0200)
committer
Tim Düsterhus
<duesterhus@woltlab.com>
Tue, 7 Jun 2022 10:01:40 +0000
(12:01 +0200)
1
2
wcfsetup/install/files/acp/templates/packageList.tpl
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/files/acp/templates/packageList.tpl
Simple merge
diff --cc
wcfsetup/install/lang/de.xml
Simple merge
diff --cc
wcfsetup/install/lang/en.xml
Simple merge