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