author | David A. Velasco <dvelasco@solidgear.es> | |
Tue, 20 Nov 2012 10:40:58 +0000 (11:40 +0100) | ||
committer | David A. Velasco <dvelasco@solidgear.es> | |
Tue, 20 Nov 2012 10:40:58 +0000 (11:40 +0100) | ||
commit | 69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b | |
tree | 86d0c5113cd75aa4e9b65be861370380ae909be6 | tree | snapshot (tar.gz tar.bz2 zip) |
parent | 3fd56ecff8c7446e9462e43e899360822d3abb91 | commit | diff |
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java | diff | blob | blame | history |