projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4015c35
ecb54c3
)
Merge branch 'refs/heads/pr/1984' into next-lantia
author
Alexander Ebert
<ebert@woltlab.com>
Tue, 26 Jan 2016 18:06:23 +0000
(19:06 +0100)
committer
Alexander Ebert
<ebert@woltlab.com>
Tue, 26 Jan 2016 18:06:23 +0000
(19:06 +0100)
# Conflicts:
# wcfsetup/install/files/js/WoltLab/WCF/Ui/Like/Handler.js
1
2
wcfsetup/install/files/js/WoltLab/WCF/Ui/Like/Handler.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/js/WoltLab/WCF/Ui/Like/Handler.js
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff