projects
/
tine20
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c10d2ae
43809c1
)
Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge
author
Lars Kneschke
<l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000
(11:05 +0100)
committer
Lars Kneschke
<l.kneschke@metaways.de>
Thu, 21 Feb 2013 10:05:05 +0000
(11:05 +0100)
Conflicts:
scripts/packaging/debian/control
1
2
tine20/library/Syncroton/lib/Syncroton/Server.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tine20/library/Syncroton/lib/Syncroton/Server.php
Simple merge
projects / tine20 / commitdiff