projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a96f68a
d30a32f
)
Merge branch '5.4'
author
Tim Düsterhus
<duesterhus@woltlab.com>
Thu, 12 Aug 2021 14:32:55 +0000
(16:32 +0200)
committer
Tim Düsterhus
<duesterhus@woltlab.com>
Thu, 12 Aug 2021 14:32:55 +0000
(16:32 +0200)
1
2
com.woltlab.wcf/templates/moderationReport.tpl
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/templates/moderationReport.tpl
Simple merge
diff --cc
wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
Simple merge