Merge pull request #5065 from tobiasd/2018.05-rc

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5b7e09b507ee0ba1801abacaaa618a287ccd1ae1..9e6504184c03c4347f630441b34c0fc8e133c13c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,10 +9,11 @@ include/jquery-1.4.2.min.js
 favicon.*\r
 home.html\r
 addon\r
+*.orig\r
 *~\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 +24,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 +43,19 @@ 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
+\r
+#ignore things from transifex-client\r
+venv/\r
+\r
+#ignore Composer dependencies\r
+/vendor\r
+/view/asset\r
+\r
+#ignore config files from JetBrains\r
+/.idea\r