Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83..8376ea87e8e5e8303d442e3e13e1b269ab3d7372 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,9 @@ 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
+/php_friendica.phpproj.user\r