Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83..25e071016730b1db7a0fc29a2ac725e2252274d0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,8 @@ nbproject
 \r
 #ignore local folder\r
 /local/\r
+\r
+#ignore config files from Visual Studio\r
+/.vs/\r
+/php_friendica.phpproj\r
+/php_friendica.sln\r