Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:13 +0000 (17:55 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:13 +0000 (17:55 +0100)
commit65f8034c3030948b0a348f7f654821b6226f6a1d
tree527aec6652885238a8c6c800af49b75fb5acfabc
parentefac6f3e14fade4d4183e03d2a5d57a2951e0514
parent00c6d8bffe0908415558e37449e4d4b140da7b0a
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
res/menu/file_actions_menu.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/utils/DisplayUtils.java