projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c25f658
aa0ca18
)
Merge branch 'next' of github.com:WoltLab/WCF into next
author
Alexander Ebert
<ebert@woltlab.com>
Sun, 12 Jul 2015 17:40:54 +0000
(19:40 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Sun, 12 Jul 2015 17:40:54 +0000
(19:40 +0200)
Conflicts:
wcfsetup/install/files/acp/templates/header.tpl
Trivial merge
projects / GitHub / WoltLab / WCF.git / commitdiff