merge develop

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 58e9255..33fa57f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -276,7 +276,6 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                         sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                     } else {\r
                         sharedWithMeIconV.setVisibility(View.GONE);\r
                         sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                     } else {\r
                         sharedWithMeIconV.setVisibility(View.GONE);\r

-\r

                     }\r
 \r
                     break;\r
                     }\r
 \r
                     break;\r