Merge branch 'master' into master

This commit is contained in:
SECURED.ORG
2017-12-11 13:48:46 -08:00
committed by GitHub

View File

@@ -173,5 +173,12 @@
"location":"London", "location":"London",
"country":"United Kingdom", "country":"United Kingdom",
"link":"https://www.blackhat.com/upcoming.html" "link":"https://www.blackhat.com/upcoming.html"
},
{
"name":"GreHack",
"month":"November",
"location":"Grenoble",
"country":"France",
"link":"https://grehack.fr/"
} }
] ]