projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9746fb9
cbf5e82
)
Merge branch '2.0'
author
Alexander Ebert
<ebert@woltlab.com>
Sat, 21 Feb 2015 17:26:57 +0000
(18:26 +0100)
committer
Alexander Ebert
<ebert@woltlab.com>
Sat, 21 Feb 2015 17:26:57 +0000
(18:26 +0100)
Conflicts:
com.woltlab.wcf/package.xml
1
2
wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff