projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b0ab3ce)
Merge remote-tracking branch 'origin/master' into cancel_in_upload
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 11 Oct 2012 09:40:15 +0000 (11:40 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 11 Oct 2012 09:40:15 +0000 (11:40 +0200)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App