Merge pull request #16 from Rurik/patch-1

Proposed clean-up
This commit is contained in:
SECURED.ORG
2017-12-11 12:52:21 -08:00
committed by GitHub

View File

@@ -1,131 +1,153 @@
[
{"name": "DEFCON",
{
"name":"DEFCON",
"month":"July",
"location":"Las Vegas, Nevada",
"country":"United States",
"link":"https://www.defcon.org/"
},
{"name": "BSides SF",
{
"name":"BSides SF",
"month":"April",
"location":"San Francisco, California",
"country":"United States",
"link":"https://bsidessf.org/"
},
{"name": "WiCyS Conference",
{
"name":"WiCyS Conference",
"month":"March",
"location":"Chicago, Illinois",
"country":"United States",
"link":"https://www.wicys.net/"
},
{"name": "ShellCon",
{
"name":"ShellCon",
"month":"October",
"location":"Los Angeles, California",
"country":"United States",
"link":"https://shellcon.io/"
},
{"name": "44CON",
{
"name":"44CON",
"month":"September",
"location":"London",
"country":"United Kingdom",
"link":"https://44con.com/"
},
{"name": "DerbyCon",
{
"name":"DerbyCon",
"month":"September",
"location":"Louisville, Kentucky",
"country":"United States",
"link":"https://www.derbycon.com/"
},
{"name": "Shmoocon",
{
"name":"Shmoocon",
"month":"January",
"location":"Washington, D.C.",
"country":"United States",
"link":"http://shmoocon.org/"
},
{"name": "BlackHat USA",
{
"name":"BlackHat USA",
"month":"July",
"location":"Las Vegas, Nevada",
"country":"United States",
"link":"https://www.blackhat.com"
},
{"name": "Recon",
{
"name":"Recon",
"month":"June",
"location":"Montreal, Quebec",
"country":"Canada",
"link":"https://recon.cx/"
},
{"name": "NBT",
{
"name":"NBT",
"month":"December",
"location":"San Francisco, California",
"country":"United States",
"link":"https://nbt4.splashthat.com/"
},
{"name": "CanSecWest",
{
"name":"CanSecWest",
"month":"March",
"location":"Vancouver, British Columbia",
"country":"Canada",
"link":"https://cansecwest.com/"
},
{"name": "Infiltrate",
{
"name":"Infiltrate",
"month":"April",
"location":"Miami Beach, Florida",
"country":"United States",
"link":"http://infiltratecon.com/"
},
{"name": "THOTCON",
{
"name":"THOTCON",
"month":"May",
"location":"Chicago, Illinois",
"country":"United States",
"link":"https://thotcon.org/"
},
{"name": "HackMiami",
{
"name":"HackMiami",
"month":"May",
"location":"Miami, Florida",
"country":"United States",
"link":"https://www.hackmiami.com/"
},
{"name": "CircleCityCon",
{
"name":"CircleCityCon",
"month":"June",
"location":"Indianapolis, Indiana",
"country":"United States",
"link":"https://circlecitycon.com/"
},
{"name": "BruCON",
{
"name":"BruCON",
"month":"October",
"location":"Gent",
"country":"Belgium",
"link":"https://brucon.org/"
},
{"name": "Enigma",
{
"name":"Enigma",
"month":"January",
"location":"Santa Clara, California",
"country":"United States",
"link":"https://www.usenix.org/Enigma"
},
{"name": "BSidesCharm",
{
"name":"BSidesCharm",
"month":"April",
"location":"Baltimore, Maryland",
"country":"United States",
"link":"http://www.bsidescharm.com/"
},
{"name": "Virus Bulliten",
{
"name":"Virus Bulliten",
"month":"October",
"location":"Madrid",
"country":"Spain",
"link":"https://www.virusbulletin.com/conference/"
},
{"name": "ZeroNights",
{
"name":"ZeroNights",
"month":"November",
"location":"Moscow",
"country":"Russia",
"link":"https://zeronights.org"
},
{"name": "PHDays",
{
"name":"PHDays",
"month":"May",
"location":"Moscow",
"country":"Russia",
"link":"https://www.phdays.com"
},
{"name": "Botconf",
{
"name":"Botconf",
"month":"December",
"location":"Montpellier",
"country":"France",