projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
23e43ac
af110f8
)
Merge remote-tracking branch 'origin/next' into next
author
Marcel Werk
<burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000
(12:20 +0200)
committer
Marcel Werk
<burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000
(12:20 +0200)
# Conflicts:
# wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php
Trivial merge