Fixed conflict - Merge branch 'develop' into better_loggin_system
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 18 Sep 2014 07:31:24 +0000 (09:31 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 18 Sep 2014 07:31:24 +0000 (09:31 +0200)
commitea5c4760c2f150f907b17c2c8609ab1353a3ef62
tree624b504e62589b1779738782e1e7dd3acdd62499
parent74c29e1ce1fcfdaac2c166678904258bbe8dddc2
parent9224d35adc82e15cc12e57b18e79af7f54bff877
Fixed conflict - Merge branch 'develop' into better_loggin_system
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/MoveActivity.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java