Merge remote-tracking branch 'remotes/upstream/streaming' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:07:58 +0000 (09:07 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:07:58 +0000 (09:07 +0100)
commit465ff1b7b8b04132f58fdea80cdf12ce9a2e01fd
treef9b9b869312835606be67f7846f7651c0fbfbf3b
parent24781619982f43b8f33d4fb11f073e9cb097e6b9
parent8a6abb8151e68dccda9ae564af3658a1c62078f3
Merge remote-tracking branch 'remotes/upstream/streaming' into beta
res/menu/file_actions_menu.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java