Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000 (18:02 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000 (18:02 +0100)
commited763a67d304e2d90c39bbdf5b323ba10b997c2c
treee09c67da8218a9704f9a35305fc59a5c7a4b56f9
parente8654191a721c6d5831992645f2c4f38a7ca35b7
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster

# Conflicts:
# res/menu/file_actions_menu.xml
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
# src/com/owncloud/android/utils/DisplayUtils.java
CHANGELOG.md