projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bb9d54b
e86dfec
)
Merge branch '2.0'
author
Alexander Ebert
<ebert@woltlab.com>
Sun, 30 Aug 2015 19:21:22 +0000
(21:21 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Sun, 30 Aug 2015 19:21:22 +0000
(21:21 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php
Trivial merge