Merge "Deleting a page and then immediately create-protecting it caused a PHP Fatal...

[lhc/web/wiklou.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dbe20fc..76d220a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,9 @@ cscope.out
 ## NetBeans
 nbproject*
 project.index
+## Sublime
 sublime-*
+sftp-config.json
 
 # MediaWiki install & usage
 /cache
@@ -60,3 +62,5 @@ Thumbs.db
 /favicon.ico
 /static*
 /tags
+/.htaccess
+/.htpasswd