author | David A. Velasco <dvelasco@solidgear.es> | |
Mon, 17 Jun 2013 12:43:26 +0000 (14:43 +0200) | ||
committer | David A. Velasco <dvelasco@solidgear.es> | |
Mon, 17 Jun 2013 12:43:26 +0000 (14:43 +0200) | ||
commit | 7f34fba421ba20cba626463ff8181ad9f89b5997 | |
tree | 2c1fde8e18b45ce249bbe0698387b41698b56b7c | tree | snapshot (tar.gz tar.bz2 zip) |
parent | c43b15deab02bde6ea9a9e4d8aa6ea1510808423 | commit | diff |
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java | diff | blob | blame | history |