Merge tag 'oc-android-1.9' into sdcard-save sdcard-save sd-android-1.9
authorPeter Henn <Peter.Henn@web.de>
Tue, 8 Dec 2015 00:13:26 +0000 (00:13 +0000)
committerPeter Henn <Peter.Henn@web.de>
Tue, 8 Dec 2015 00:13:26 +0000 (00:13 +0000)
commit70e79071435bc8d7a53f36eb4202c4ec05dd2075
tree6c5375d508317a6548b3a7d0df19aba87126d938
parentbbfcb04a9947d0076dff20bb57d2944b85d6dc65
parent106a2324e113d997db71f00a63ecda3ad828f098
Merge tag 'oc-android-1.9' into sdcard-save

Version 1.9: Release with expanded sharing
Resolved conflicts in:
src/com/owncloud/android/utils/FileStorageUtils.java
src/com/owncloud/android/utils/FileStorageUtils.java