projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
71430eb
)
Merge branch 'develop' into refactor_remote_operation_to_download_file
author
masensio
<masensio@solidgear.es>
Wed, 18 Dec 2013 09:04:42 +0000
(10:04 +0100)
committer
masensio
<masensio@solidgear.es>
Wed, 18 Dec 2013 09:04:42 +0000
(10:04 +0100)
Conflicts:
oc_framework-test-project/AndroidManifest.xml
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff