Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:33:23 +0000 (13:33 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:33:23 +0000 (13:33 +0100)
commitaf1f880b27f12c95703c37077e8074a9c9851df8
treeb39ded283073155690c3f565c1113b704f392c32
parent4852ca8dd4578abbd651907aa3065af0dfaf2b4c
parent271078a4039f3c674462f929bc97528901e41e64
Merge branch 'develop' into send_file_pr311_with_develop
res/values/setup.xml
res/values/strings.xml
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/dialog/ShareLinkToDialog.java