Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:53:05 +0000 (18:53 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:53:05 +0000 (18:53 +0100)
commitaf17dcc57236083ca0959bc1eb979a469bbfb101
tree219c81dfea2425b2c680867f8d380ab38985ce6b
parentcc05129c903b9e6bb7e00af479cb61ce203d3b63
parent4e5b4c604fc3e6894838aa207d0e12447a05cb90
Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta
33 files changed:
res/values-cs-rCZ/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-eo/strings.xml
res/values-es/strings.xml
res/values-fi-rFI/strings.xml
res/values-fr/strings.xml
res/values-hu-rHU/strings.xml
res/values-id/strings.xml
res/values-it/strings.xml
res/values-ko/strings.xml
res/values-lt-rLT/strings.xml
res/values-nb-rNO/strings.xml
res/values-nl/strings.xml
res/values-oc/strings.xml
res/values-pt-rBR/strings.xml
res/values-ru/strings.xml
res/values-sr/strings.xml
res/values-th-rTH/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-zh-rCN/strings.xml
res/values/setup.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java