Andy Scherzinger a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts (resolved): res/layout/drawer.xml res/values/colors.xml res/values/setup.xml		2015-12-28 20:03:25 +01:00
..
images	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
ocdoc@343496c792	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-28 20:03:25 +01:00
android_app.rst	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
conf.py	update version number in conf.py	2015-12-04 14:37:20 -08:00
index.rst	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08: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	Add means to build user manual via make	2015-01-27 23:40:53 +01:00