Added conflict icon to folders containing files with conflicts
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Aug 2015 08:36:42 +0000 (10:36 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Sep 2015 13:13:47 +0000 (15:13 +0200)
commita2aa0479fc590a42b2167e5748d374f2df29dfad
tree3ec6fb55b41b086c20a1318363e2ce9c1efd1b50
parente6c1454458419ff0c47c64fac3d11ebc158cccc8
Added conflict icon to folders containing files with conflicts
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java