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

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5b7e09b507ee0ba1801abacaaa618a287ccd1ae1..25e071016730b1db7a0fc29a2ac725e2252274d0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ addon
 *~\r
 robots.txt\r
 \r
-#ignore documentation, it should be newly built \r
+#ignore documentation, it should be newly built\r
 doc/html\r
 \r
 #ignore reports, should be generted with every build\r
@@ -23,7 +23,7 @@ report/
 .buildpath\r
 .externalToolBuilders\r
 .settings\r
-#ignore OSX .DS_Store files \r
+#ignore OSX .DS_Store files\r
 .DS_Store\r
 \r
 /nbproject/private/\r
@@ -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