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

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 85d3271e91a5a3823d62a72591ca1aa7da401bfa..3c0570c67d2e40d25558c941d25f8ff061486bae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,5 @@ nbproject
 #ignore vagrant dir\r
 .vagrant/\r
 \r
-#ignore test folder\r
-/test/\r
+#ignore local folder\r
+/local/\r