Merge branch 'master' of https://github.com/meoooh/awesome-pentest into meoooh-master

This commit is contained in:
Nick Raienko 2015-01-19 20:23:24 +02:00
commit d001c7ef9f

View File

@ -222,6 +222,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
* [LayerOne](http://www.layerone.org/) - An annual US security conerence held every spring in Los Angeles
* [DeepSec](https://deepsec.net/) - Security Conference in Vienna, Austria
* [SkyDogCon](http://www.skydogcon.com/) - A technology conference in Nashville
* [SECUINSIDE](http://secuinside.com) - Security Conference in [Seoul](http://en.wikipedia.org/wiki/Seoul)
### Information Security Magazines