projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
870b093
d7ddd4d
)
Merge branch '2.0'
author
Alexander Ebert
<ebert@woltlab.com>
Mon, 14 Apr 2014 13:47:15 +0000
(15:47 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Mon, 14 Apr 2014 13:47:15 +0000
(15:47 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js
Trivial merge