Merge branch 'develop' of https://github.com/minimus/simple-ads-manager…

… into develop
minimus · Dec 29, 2013 · 311d385 · 311d385
2 parents 4d57963 + 1fe0595
commit 311d385
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .idea/workspace.xml
+test.html