Merge branch 'hotfix/gitignore'

zendframework · Oct 5, 2012 · c8c1a84 · c8c1a84
2 parents f30a767 + ee64dee
commit c8c1a84
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ nbproject
 .settings/
 tmp/
 .DS_Store
-composer.lock
+composer.lock
+.*.sw*
+.*.un~