Merge branch 'master' of https://github.com/sepehr/gitignore into sepehr-master

defunkt · defunkt · commit 1f0cc1d43b25 · 2011-02-21T18:00:51.000-08:00
diff --git a/Drupal.gitignore b/Drupal.gitignore
@@ -3,7 +3,6 @@ sites/default/private
 sites/default/settings.php
 cache/
 files/
-settings.php
 /README.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore
@@ -0,0 +1,6 @@
+INSTALL.txt
+LICENSE.txt
+README.txt
+demos/
+extras/documentation
+
