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)
commite2d0a1cfb477c201b935d0760546ef97382de5f4
tree3cba291e506bdeb687d5c2c16ed2e13f5f682a6b
parentd0232cfe34aed1d2b14c3edaa3a28d28b4d3449f
parentbba296472602f725df7ab4bb2c4a282b40c737ad
Merge remote-tracking branch 'remotes/upstream/master' into streaming
res/menu/file_actions_menu.xml
res/values/strings.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java