adding conf

This commit is contained in:
Amanda Rousseau
2017-12-11 11:04:40 -08:00
parent 34dfe785a8
commit c4105e4256

View File

@@ -22,5 +22,23 @@
"location":"Los Angeles, CA",
"country": "USA",
"link": "https://shellcon.io/"
},
{"name": "44CON",
"month":"September",
"location":"London",
"country": "UK",
"link": "https://44con.com/"
},
{"name": "DerbyCon",
"month":"September",
"location":"Louisville, KY",
"country": "USA",
"link": "https://www.derbycon.com/"
},
{"name": "Shmoocon",
"month":"January",
"location":"Washington, DC",
"country": "USA",
"link": "http://shmoocon.org/"
}
]