Added conflict icon to folders containing files with conflicts
[pub/Android/ownCloud.git] / tests / res / values / strings.xml
2012-09-29 Bartek Przybylskijunit for android app