Merge branch 'shark0der-master'

This commit is contained in:
Nick Raienko 2015-03-09 05:14:20 +02:00
commit df1f992736

View File

@ -254,6 +254,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
* [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)
* [DefCamp](http://defcamp.ro) - Largest Security Conference in Eastern Europe, held anually in Bucharest, Romania
### Information Security Magazines