projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d54345d)
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 8 Jan 2015 21:41:41 +0000 (22:41 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 8 Jan 2015 21:41:41 +0000 (22:41 +0100)
Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java


No differences found
ownCloud Android App