Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog...
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 20 Nov 2012 13:41:04 +0000 (14:41 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 20 Nov 2012 13:41:04 +0000 (14:41 +0100)
commit38a80be828c9b10166df586e2c77d357030477a9
treed91870fc926297843d8b8b65be0d82d909558461
parent195b0092129ba4e38c6bb7981022a63c7a0cdfc4
Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java