From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 20 Aug 2015 08:44:19 +0000 (+0200)
Subject: Persist conflicts in local database and show with an icon in the list of files
X-Git-Tag: oc-android-1.9^2~37^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6c1454458419ff0c47c64fac3d11ebc158cccc8?hp=e6c1454458419ff0c47c64fac3d11ebc158cccc8

Persist conflicts in local database and show with an icon in the list of files
---