projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6830af
bcf1120
)
Merge branch '2.0'
author
Marcel Werk
<burntime@woltlab.com>
Fri, 6 Jun 2014 21:09:24 +0000
(23:09 +0200)
committer
Marcel Werk
<burntime@woltlab.com>
Fri, 6 Jun 2014 21:09:24 +0000
(23:09 +0200)
Conflicts:
com.woltlab.wcf/package.xml
1
2
com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff