Merge pull request #2158 from annando/1512-vier-fonts

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 38d5e6fd2c77ae100eb24349d6801421b4cc3549..3c0570c67d2e40d25558c941d25f8ff061486bae 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
@@ -33,7 +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