projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 903aef2 4316d70)
Merge tag 'oc-android-1.8' into sdcard-save sd-android-1.8
authorPeter Henn <Peter.Henn@web.de>
Sat, 3 Oct 2015 10:03:37 +0000 (10:03 +0000)
committerPeter Henn <Peter.Henn@web.de>
Sat, 3 Oct 2015 10:03:37 +0000 (10:03 +0000)
commitbbfcb04a9947d0076dff20bb57d2944b85d6dc65
tree2bcda50af9daad952cc397daa10c6278abcb8d42tree | snapshot (tar.gz tar.bz2 zip)
parent903aef2ba28cd3e4c31eccb89497fd31a7da502bcommit | diff
parent4316d7082f69fd8f094caa68a3001b7ed9a43316commit | diff
Merge tag 'oc-android-1.8' into sdcard-save

Version 1.8: Includes Material Design
Resolved conflicts in:
src/com/owncloud/android/utils/FileStorageUtils.java
src/com/owncloud/android/utils/FileStorageUtils.java diff1 | diff2 | blob | history
ownCloud Android App