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