Merge branch 'develop' of https://github.com/tdzmont/Vega into develop

Conflicts: scripts/scanner/modules/injection/bash-inject.js
subgraph · Oct 14, 2014 · 30dbd7e · 30dbd7e
2 parents 23dde89 + 11442b7
commit 30dbd7e
Showing 1 changed file with 0 additions and 112 deletions.
diff --git a/scripts/scanner/modules/injection/bash-inject.js b/scripts/scanner/modules/injection/bash-inject.js