12 commits

Author	SHA1	Message	Date
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
Carla Schroder	1fea82efde	update submodule & integrate new theme changes	2015-12-07 16:48:21 -08:00
Carla Schroder	2d8b063595	update version number in conf.py	2015-12-04 14:37:20 -08:00
Carla Schroder	df56333624	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
Carla Schroder	b455705d4c	more file management options	2015-11-05 09:48:53 -08:00
Carla Schroder	e55bf94498	Updated with new images and text for 1.8	2015-11-04 15:18:15 -08:00
Carla Schroder	b7664364d7	Update version number	2015-01-27 16:35:45 -08:00
Daniel Molkentin	0bb94f3c29	user manual: Fix incorrect line wrapping in config file	2015-01-27 23:41:33 +01:00
Daniel Molkentin	67ea45aa9f	Add means to build user manual via make	2015-01-27 23:40:53 +01:00
Daniel Molkentin	a9d12f3b1c	manual: omit ocdoc/* during doc generation	2015-01-27 23:35:45 +01:00
Carla Schroder	7d1839ee96	add submodule to user manual	2015-01-27 12:11:26 -08:00
Carla Schroder	ead95b9d9c	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00