From 370aeda12bf1ce3f0278cd8d61b18f7e5805ab18 Mon Sep 17 00:00:00 2001 From: Pierre LALET Date: Mon, 11 Dec 2017 21:58:28 +0100 Subject: [PATCH 1/2] Add GreHack --- community/list.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/community/list.json b/community/list.json index 17de108..caae69e 100644 --- a/community/list.json +++ b/community/list.json @@ -152,5 +152,12 @@ "location":"Montpellier", "country":"France", "link":"https://www.botconf.eu/" + }, + { + "name":"GreHack", + "month":"November", + "location":"Grenoble", + "country":"France", + "link":"https://grehack.fr/" } ] From aa9bf944a81b0f33f4bf4dea0fc704103e10dac2 Mon Sep 17 00:00:00 2001 From: xcellardoor Date: Mon, 11 Dec 2017 21:13:48 +0000 Subject: [PATCH 2/2] Added some UK Conferences --- community/list.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/community/list.json b/community/list.json index 17de108..41d206a 100644 --- a/community/list.json +++ b/community/list.json @@ -152,5 +152,26 @@ "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" + } ]