Merge pull request #17 from p-l-/grehack

Add GreHack Conference
This commit is contained in:
SECURED.ORG
2017-12-11 13:47:29 -08:00
committed by GitHub

View File

@@ -152,5 +152,12 @@
"location":"Montpellier", "location":"Montpellier",
"country":"France", "country":"France",
"link":"https://www.botconf.eu/" "link":"https://www.botconf.eu/"
},
{
"name":"GreHack",
"month":"November",
"location":"Grenoble",
"country":"France",
"link":"https://grehack.fr/"
} }
] ]