Merge branch 'develop' into cancel_transfer_for_deleted_users
[pub/Android/ownCloud.git] / tests / res /
2012-09-29 Bartek Przybylskijunit for android app