Merge pull request #18 from xcellardoor/master

Added some UK Conferences
This commit is contained in:
SECURED.ORG
2017-12-11 13:49:57 -08:00
committed by GitHub

View File

@@ -152,8 +152,29 @@
"location":"Montpellier",
"country":"France",
"link":"https://www.botconf.eu/"
},
{
},
{
"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",