Merge branch 'master' of http://git.syncroton.org/Syncroton
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 8 Oct 2012 10:41:22 +0000 (12:41 +0200)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 8 Oct 2012 10:41:22 +0000 (12:41 +0200)
commitc4a78c4f0bc8729ca4d96eb7696c49f092e1de70
treebdf78e8a9c5d9fff9d6b5a22b91c5497f565d15c
parent35bf7d264e0c85baf1bdf6e9893d2cc34baa8587
parentd0b3c325a18abe813c71bf87be57493e184c7ab5
Merge branch 'master' of git.syncroton.org/Syncroton
13 files changed:
tine20/library/Syncroton/lib/Syncroton/Command/FolderSync.php
tine20/library/Syncroton/lib/Syncroton/Command/ItemOperations.php
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Command/Wbxml.php
tine20/library/Syncroton/lib/Syncroton/Model/FileReference.php
tine20/library/Syncroton/lib/Syncroton/Model/SyncCollection.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/tests/Syncroton/Command/ATestCase.php
tine20/library/Syncroton/tests/Syncroton/Command/ItemOperationsTests.php
tine20/library/Syncroton/tests/Syncroton/Command/PingTests.php
tine20/library/Syncroton/tests/Syncroton/Command/SyncTests.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php