projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
516b9cc
fd93437
)
Merge branch '5.2' into 5.3
author
Matthias Schmidt
<gravatronics@live.com>
Wed, 18 Nov 2020 16:32:58 +0000
(17:32 +0100)
committer
Matthias Schmidt
<gravatronics@live.com>
Wed, 18 Nov 2020 16:32:58 +0000
(17:32 +0100)
1
2
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/media/MediaAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
Simple merge
diff --cc
wcfsetup/install/files/lib/data/media/MediaAction.class.php
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff