projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
eaa3b1e
)
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
author
tobiasKaminsky
<tobias@kaminsky.me>
Sat, 29 Nov 2014 11:18:02 +0000
(12:18 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Sat, 29 Nov 2014 11:18:02 +0000
(12:18 +0100)
-fr/strings.xml
Conflicts:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff