projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 75fd0f4)
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)
Conflicts:
owncloud-android-library
src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java


No differences found
ownCloud Android App