projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be6cd0d
f7c80c0
)
Merge branch '2.0'
author
Alexander Ebert
<ebert@woltlab.com>
Thu, 26 Feb 2015 13:38:59 +0000
(14:38 +0100)
committer
Alexander Ebert
<ebert@woltlab.com>
Thu, 26 Feb 2015 13:38:59 +0000
(14:38 +0100)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/lib/system/WCF.class.php
1
2
wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff