projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 8c96447)
Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 9 Aug 2014 08:20:07 +0000 (10:20 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 9 Aug 2014 08:20:07 +0000 (10:20 +0200)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java


No differences found
ownCloud Android App