Merge branch 'develop' into forbidden_characters_from_server
authormasensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:51:13 +0000 (14:51 +0200)
committermasensio <masensio@solidgear.es>
Mon, 15 Jun 2015 12:51:13 +0000 (14:51 +0200)
commit75fd0f40c642f3a4fc66dfa17620417d78dd2571
tree386a461afe81fce513ce39d074db9a27910c273c
parent705d2eb7733e23fa1f7e0b6e23ced754b7f07dcc
parent1ef9c86b59575ece900b9770c39184e5e2011918
Merge branch 'develop' into forbidden_characters_from_server

Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
owncloud-android-library
res/values/strings.xml
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java