Merge branch 'master' into develop

fegorama · Oct 2, 2015 · 6a3a816 · 6a3a816
2 parents 9c402e6 + e6dc06f
commit 6a3a816
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/resources/eicar.com b/resources/eicar.com
diff --git a/resources/eicar.exe b/resources/eicar.exe