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	New screenshots	2016-06-20 15:00:34 +02:00
ocdoc@343496c792	Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud	2016-06-23 21:10:58 +02:00
.gitignore	Updates for 1.9.1 release	2016-02-10 12:08:29 -08:00
android_app.rst	Use Nextcloud naming	2016-06-12 18:07:05 +02:00
conf.py	New screenshots	2016-06-20 15:00:34 +02:00
index.rst	New screenshots	2016-06-20 15:00:34 +02:00
make.bat	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
Makefile	Use Nextcloud documentation	2016-06-12 18:07:04 +02:00