adding conf

This commit is contained in:
Amanda Rousseau
2017-12-11 11:08:09 -08:00
parent c4105e4256
commit 635d858645

View File

@@ -2,43 +2,43 @@
{"name": "DEFCON",
"month":"July",
"location":"Las Vegas, Nevada",
"country": "USA",
"country": "United States",
"link": "https://www.defcon.org/"
},
{"name": "BSides SF",
"month":"April",
"location":"San Francisco, CA",
"country": "USA",
"location":"San Francisco, California",
"country": "United States",
"link": "https://bsidessf.org/"
},
{"name": "WiCyS Conference",
"month":"March",
"location":"Chicago, IL",
"country": "USA",
"location":"Chicago, Illinois",
"country": "United States",
"link": "https://www.wicys.net/"
},
{"name": "ShellCon",
"month":"October",
"location":"Los Angeles, CA",
"country": "USA",
"location":"Los Angeles, California",
"country": "United States",
"link": "https://shellcon.io/"
},
{"name": "44CON",
"month":"September",
"location":"London",
"country": "UK",
"country": "United Kingdom",
"link": "https://44con.com/"
},
{"name": "DerbyCon",
"month":"September",
"location":"Louisville, KY",
"country": "USA",
"location":"Louisville, Kentucky",
"country": "United States",
"link": "https://www.derbycon.com/"
},
{"name": "Shmoocon",
"month":"January",
"location":"Washington, DC",
"country": "USA",
"location":"Washington, D.C.",
"country": "United States",
"link": "http://shmoocon.org/"
}
]