projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
932c00f
)
Merge branch 'setAsWallpaper' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 2 Nov 2015 08:43:58 +0000
(09:43 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 2 Nov 2015 08:43:58 +0000
(09:43 +0100)
# Conflicts:
# res/values/strings.xml
# src/com/owncloud/android/files/FileOperationsHelper.java
No differences found