Merge master

2015-08-13 20:56:45 +01:00 · 2015-08-13 20:56:45 +01:00 · 0c3523972c
commit 0c3523972c
parent e947dbb5ff 13b46274a7
7 changed files with 66 additions and 51 deletions
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@ -74,7 +74,7 @@ meetups:
        url: http://www.accessiblebristol.org.uk

    udiff:
-        name: unified.diff
+        name: Unified Diff
        logo: unified-diff.png
        url: http://unifieddiff.co.uk

@ -83,3 +83,14 @@ hightlightjs: default
 digitalocean_referral: a913b4b00d4a

 default_date_format: jS F, Y
+
+availability:
+    day:
+        available: no
+        start: ~
+        end: ~
+    evenings:
+        available: limited
+        start: 2015-08-10
+        end: ~
+