Merge branch 'master' into drupal-somerset

2017-10-24 23:59:02 +01:00 · 2017-10-24 23:59:02 +01:00 · 6b07d8b397
commit 6b07d8b397
parent cf02f0ad83 1b73fedd9c
12 changed files with 650 additions and 2217 deletions
--- a/app/data/events.yml
+++ b/app/data/events.yml
@ -111,7 +111,6 @@ events:
        - event: swdug
          date: '2014-08-19'
          talk_title: About the Drupal Association
-        #       type: Talk

        - event: drupalcamp-brighton-15
          date: '2015-01-18'