tobiasKaminsky 1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud ... # Conflicts: # res/drawable-hdpi/ic_checkbox_marked.png # res/drawable-mdpi/ic_checkbox_marked.png # res/drawable-xhdpi/ic_checkbox_marked.png # res/drawable-xxhdpi/ic_checkbox_marked.png # res/layout/grid_image.xml # res/values/strings.xml # src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java # src/com/owncloud/android/ui/activity/FileDisplayActivity.java # src/com/owncloud/android/ui/adapter/FileListListAdapter.java # src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java # src/com/owncloud/android/ui/fragment/OCFileListFragment.java		2016-06-23 21:10:58 +02:00
..
images
ocdoc@343496c792
.gitignore
android_app.rst
conf.py
index.rst
make.bat
Makefile