projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 77ddd1c)
Merge branch 'develop' into feature_previews
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:44:30 +0000 (16:44 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:44:30 +0000 (16:44 +0200)
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found
ownCloud Android App