Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework

[friendica.git] / .gitignore

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