Merge develop into 1404_reworked_autocomplete

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 71528335901c55cdb6b5ae4c75faeecae5670bb5..5b7e09b507ee0ba1801abacaaa618a287ccd1ae1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 favicon.*\r
 .htconfig.php\r
+.htpreconfig.php\r
 \#*\r
 include/jquery-1.4.2.min.js\r
 *.log\r
@@ -12,7 +13,7 @@ addon
 robots.txt\r
 \r
 #ignore documentation, it should be newly built \r
-doc/api\r
+doc/html\r
 \r
 #ignore reports, should be generted with every build\r
 report/\r
@@ -33,4 +34,11 @@ report/
 #ignore cache folders\r
 /privacy_image_cache/\r
 /photo/\r
+/proxy/\r
 nbproject\r
+\r
+#ignore vagrant dir\r
+.vagrant/\r
+\r
+#ignore local folder\r
+/local/\r