[guadec-web: 3/3] Merge branch 'social-events-football' into 'master'

[Kat <kat src gnome org>]

commit 2f53ca4d9f93efc2574b2d59a5c23962d4e08560
Merge: 23ea16f 0bb4d71
Author: Kat <kittykat3756 gmail com>
Date:   Mon Jun 18 16:02:44 2018 +0000

    Merge branch 'social-events-football' into 'master'
    
    Add Social events page + football game info
    
    See merge request Infrastructure/guadec-web!17

 content/pages/social-events.md | 6 ++++--
 pelicanconf.py                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
---