JC Brand 5f97f7ea28 Merge branch 'master' into gh-pages ... Conflicts: build.js converse.min.css converse.min.js docs/doctrees/environment.pickle docs/html/searchindex.js index.html		2013-07-30 23:40:59 +02:00
..
_sources	'build' grunt task was renamed to 'fetch'. Updated docs	2013-07-30 21:43:49 +02:00
_static	Add a custom sphinx theme	2013-04-26 21:49:26 +02:00
static	Expand the docs	2013-05-22 19:29:46 +02:00
.buildinfo	Update docs with info on how to set up the dev env	2013-07-29 23:13:55 +02:00
genindex.html	Update docs with info on how to set up the dev env	2013-07-29 23:13:55 +02:00
index.html	'build' grunt task was renamed to 'fetch'. Updated docs	2013-07-30 21:43:49 +02:00
objects.inv	Update docs with info on how to set up the dev env	2013-07-29 23:13:55 +02:00
search.html	Update docs with info on how to set up the dev env	2013-07-29 23:13:55 +02:00
searchindex.js	Merge branch 'master' into gh-pages	2013-07-30 23:40:59 +02:00