projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 65f403b)
Merge branch 'develop' into fixForCrashedSharedContents
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 12:25:02 +0000 (14:25 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 12:25:02 +0000 (14:25 +0200)
Conflicts:
src/com/owncloud/android/Uploader.java


No differences found
ownCloud Android App