Christopher Allan Webber 82be36d125 Merge branch 'stable' ...

Conflicts:
	docs/source/siteadmin/deploying.rst

2015-03-19 20:44:49 -05:00

..

source

Merge branch 'stable'

2015-03-19 20:44:49 -05:00

Makefile

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

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