From: masensio <masensio@solidgear.es>
Date: Mon, 16 Mar 2015 10:15:27 +0000 (+0100)
Subject: Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
X-Git-Tag: oc-android-1.7.1_signed^2~9^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/876204faf03075e286cf550b3bfba86d3f5a1419

Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
---

876204faf03075e286cf550b3bfba86d3f5a1419
diff --cc src/com/owncloud/android/ui/activity/Uploader.java
index 6efd6b4c,d8b1225c..8a01972a
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@@ -75,11 -72,8 +78,8 @@@ import com.owncloud.android.utils.Error
  
  /**
   * This can be used to upload things to an ownCloud instance.
-  * 
-  * @author Bartek Przybylski
-  * 
   */
 -public class Uploader extends SherlockListActivity implements OnItemClickListener, android.view.View.OnClickListener {
 +public class Uploader extends FileActivity implements OnItemClickListener, android.view.View.OnClickListener {
      private static final String TAG = "ownCloudUploader";
  
      private Account mAccount;