Merge branch 'master' into talks

This commit is contained in:
Oliver Davies 2015-09-10 01:30:48 +01:00
commit 3d91db28c2
3 changed files with 11 additions and 13 deletions

View file

@ -56,7 +56,6 @@ default_date_format: jS F, Y
fuzzy_date_format: F Y
title_separator: "|"
html_lang: en-GB
bootswatch: lumen
availability:
status: