Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotonMerge2

[tine20] / tine20 / library / Syncroton / lib / Syncroton / Server.php

diff --git a/lib/Syncroton/Server.php b/tine20/library/Syncroton/lib/Syncroton/Server.php
similarity index 100%
rename from lib/Syncroton/Server.php
rename to tine20/library/Syncroton/lib/Syncroton/Server.php