Merge branch 'master' into master

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

View File

@@ -159,5 +159,33 @@
"location":"Ljubljana",
"country":"Slovenia",
"link":"https://0x7e2.bsidesljubljana.si/"
},
{
"name":"Steelcon",
"month":"July",
"location":"Sheffield",
"country":"United Kingdom",
"link":"https://www.steelcon.info/"
},
{
"name":"BSides London",
"month":"June",
"location":"London",
"country":"United Kingdom",
"link":"https://www.securitybsides.org.uk/"
},
{
"name":"Blackhat EU",
"month":"December",
"location":"London",
"country":"United Kingdom",
"link":"https://www.blackhat.com/upcoming.html"
},
{
"name":"GreHack",
"month":"November",
"location":"Grenoble",
"country":"France",
"link":"https://grehack.fr/"
}
]