Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
[pub/Android/ownCloud.git] / tests / project.properties
2012-09-29 Bartek Przybylskijunit for android app