Merge branch 'master' into 'master'

add fossmeet'18 to events

Add FOSSMeet'18 to the events list

See merge request !6
1 job for master