X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitignore;h=9e6504184c03c4347f630441b34c0fc8e133c13c;hb=5419ae93a1e1100800910cf551a6fa7d604e16f3;hp=655df82c0904005fad15c2c2a40b98b579ff5c1a;hpb=a6742d3db65b5ad430ba83d9f752931458861bc2;p=friendica.git

diff --git a/.gitignore b/.gitignore
index 655df82c09..9e6504184c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,12 @@ include/jquery-1.4.2.min.js
 favicon.*
 home.html
 addon
+*.orig
 *~
 robots.txt
 
-#ignore documentation, it should be newly built 
-doc/api
+#ignore documentation, it should be newly built
+doc/html
 
 #ignore reports, should be generted with every build
 report/
@@ -23,7 +24,7 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
-#ignore OSX .DS_Store files 
+#ignore OSX .DS_Store files
 .DS_Store
 
 /nbproject/private/
@@ -34,4 +35,27 @@ report/
 #ignore cache folders
 /privacy_image_cache/
 /photo/
+/proxy/
 nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore Composer dependencies
+/vendor
+/view/asset
+
+#ignore config files from JetBrains
+/.idea