Christopher Allan Webber a35b7c7fb3 Merge branch 'stable' ...

Conflicts:
	docs/source/siteadmin/deploying.rst
	docs/source/siteadmin/relnotes.rst

2015-04-17 17:09:06 -05:00

..

source

Merge branch 'stable'

2015-04-17 17:09:06 -05:00

Makefile

Added an "htmlview" target to open docs after building them.

2015-01-09 23:05:04 +02:00