author | tobiasKaminsky <tobias@kaminsky.me> | |
Mon, 3 Aug 2015 20:42:58 +0000 (22:42 +0200) | ||
committer | David A. Velasco <dvelasco@solidgear.es> | |
Tue, 4 Aug 2015 10:39:59 +0000 (12:39 +0200) | ||
commit | e1ab4a41aa97c9cc978618f88baec5556c1c14f4 | |
tree | 56a4d75efc5898274701685001c0a08748cbb173 | tree | snapshot (tar.gz tar.bz2 zip) |
parent | d2df3f9b33263b63069aebc249475b1da31efd03 | commit | diff |
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java | diff | blob | blame | history | |
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java | diff | blob | blame | history |