Files
openstackdocstheme/setup.cfg
Anne Gentle c82a48d0d0 Merge branch 'master' of https://github.com/annegentle/openstackdocstheme
Conflicts:
	README.rst
	conf.py
	setup.cfg
2015-01-28 14:01:32 -06:00

924 B