f1575ece1a
This did not fast-forward merge because I'd made changes to those files since Martin submitted his merge request. This merge brings in the changes contributed in the following two commits from Martin: commit |
||
---|---|---|
.. | ||
about | ||
admin-media | ||
docs | ||
donate | ||
img | ||
members | ||
overview | ||
privacy-policy | ||
sponsors | ||
401error.html | ||
403error.html | ||
404error.html | ||
500error.html | ||
conservancy.css | ||
favicon.ico | ||
robots.txt |