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 |
||
---|---|---|
.. | ||
blog | ||
feeds | ||
news | ||
500.html | ||
base_about.html | ||
base_blog.html | ||
base_conservancy.html | ||
base_error.html | ||
base_members.html | ||
base_news.html | ||
base_standard.html | ||
feeds.html | ||
frontpage.html |