From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 21 Aug 2015 08:36:42 +0000 (+0200)
Subject: Added conflict icon to folders containing files with conflicts
X-Git-Tag: oc-android-1.9^2~37^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a2aa0479fc590a42b2167e5748d374f2df29dfad?ds=inline;hp=a2aa0479fc590a42b2167e5748d374f2df29dfad

Added conflict icon to folders containing files with conflicts
---