JC Brand 1dff3ac002 Merge branch '0.8' ... Conflicts: CONTRIBUTING.rst Makefile README.rst bower.json docs/CHANGES.rst docs/doctrees/index.doctree docs/html/_sources/index.txt docs/html/index.html docs/html/searchindex.js docs/source/index.rst		2014-04-19 07:05:00 +02:00
..
_sources	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
_static	Update docs to mention new way to minify. Fixes #39	2013-08-20 22:53:19 +02:00
static	Tweak docs css	2013-08-09 09:25:30 +02:00
.buildinfo	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
genindex.html	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
index.html	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
objects.inv	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
search.html	Merge branch '0.8'	2014-04-19 07:05:00 +02:00
searchindex.js	Merge branch '0.8'	2014-04-19 07:05:00 +02:00