Merge pull request #2190 from annando/1512-getload

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 06dc807bd5444f7e5140655f743bb28f446a69f2..3c0570c67d2e40d25558c941d25f8ff061486bae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,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