projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0232cf bba2964)
Merge remote-tracking branch 'remotes/upstream/master' into streaming
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 07:29:10 +0000 (08:29 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 07:29:10 +0000 (08:29 +0100)
1  2 
res/menu/file_actions_menu.xml patch | diff1 | diff2 | blob | history
res/values/strings.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java patch | diff1 | diff2 | blob | history

diff --cc res/menu/file_actions_menu.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
ownCloud Android App