projects
/
tine20
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27c4e32
591742f
)
Merge branch '2013.03' into 2013.10
author
Philipp Schüle
<p.schuele@metaways.de>
Mon, 28 Oct 2013 11:24:23 +0000
(12:24 +0100)
committer
Philipp Schüle
<p.schuele@metaways.de>
Mon, 28 Oct 2013 11:24:23 +0000
(12:24 +0100)
1
2
tests/tine20/Calendar/Controller/EventNotificationsTests.php
patch
|
diff1
|
diff2
|
blob
|
history
tine20/Addressbook/Convert/Contact/VCard/Factory.php
patch
|
diff1
|
diff2
|
blob
|
history
tine20/Addressbook/Convert/Contact/VCard/MacOSX.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/tine20/Calendar/Controller/EventNotificationsTests.php
Simple merge
diff --cc
tine20/Addressbook/Convert/Contact/VCard/Factory.php
Simple merge
diff --cc
tine20/Addressbook/Convert/Contact/VCard/MacOSX.php
Simple merge