projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
234f0a1
e22e99b
)
Merge remote-tracking branch 'origin/next' into next
author
Alexander Ebert
<ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000
(22:38 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000
(22:38 +0200)
# Conflicts:
# wcfsetup/install/files/lib/util/HeaderUtil.class.php
Trivial merge