Merge branch 'master' of https://github.com/shark0der/awesome-pentest …

…into shark0der-master
Chelz · Mar 9, 2015 · f3d5197 · f3d5197
2 parents 2635f19 + eb80c27
commit f3d5197
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/README.md b/README.md
@@ -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