Merge branch 'develop' into share_password_support
authormasensio <masensio@solidgear.es>
Fri, 6 Mar 2015 09:19:06 +0000 (10:19 +0100)
committermasensio <masensio@solidgear.es>
Fri, 6 Mar 2015 09:19:06 +0000 (10:19 +0100)
commit82fa95fe43a82a294ef1212980ca9a32a8c50283
treeaf167ccdb355f851b8c650b7aa8f33b673b663a7
parent9e55ef9585ff99b8317acaa4df0bf6c1c6f4a874
parenteafaf80dd49523b5240cf964133699252c06e66f
Merge branch 'develop' into share_password_support
src/com/owncloud/android/operations/CreateShareOperation.java
src/com/owncloud/android/services/OperationsService.java
src/com/owncloud/android/ui/activity/FileActivity.java