Merge branch 'master' into talks

This commit is contained in:
Oliver Davies 2015-09-09 22:16:04 +01:00
commit 0edd19efa1
4 changed files with 88 additions and 21 deletions

View file

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