Jeff Forcier a8ad23e61a Merge branch '1.11' into 1.12 ... Conflicts: sites/www/changelog.rst		2014-03-13 21:52:56 -07:00
..
_shared_static	Start fleshing out two-site setup	2014-01-21 16:15:30 -08:00
docs	Semi no-op fix to test RTD hooks	2014-03-04 15:45:01 -08:00
www	Merge branch '1.11' into 1.12	2014-03-13 21:52:56 -07:00
shared_conf.py	Simplify www page footer.	2014-02-03 14:10:23 -08:00