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