Merge pull request #104 from giomke/patch-1

Update Archived Security Conference Videos
This commit is contained in:
VS 2018-11-27 07:54:35 +02:00 committed by GitHub
commit 68ed0699f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -328,6 +328,7 @@ Name | Description
---- | ---- ---- | ----
[InfoCon.org](https://infocon.org/cons/) | hosts data from hundreds of cons [InfoCon.org](https://infocon.org/cons/) | hosts data from hundreds of cons
[Irongeek](http://www.irongeek.com/) | Website of Adrien Crenshaw, hosts a ton of info. [Irongeek](http://www.irongeek.com/) | Website of Adrien Crenshaw, hosts a ton of info.
[infocondb.org](https://infocondb.org/) | a site that aims to catalog and cross-reference all hacker conferences.
### Online Communities ### Online Communities
Name | Description Name | Description