X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitignore;h=cd299f2d859153ebc7169fe30918a5cdd4b14568;hb=44e1cbabee56a1684a81544d13bc2fb309f7bb0a;hp=38d5e6fd2c77ae100eb24349d6801421b4cc3549;hpb=c23de3a64ecc0b87dd2bf3e4987b867749fbf5e7;p=friendica.git

diff --git a/.gitignore b/.gitignore
index 38d5e6fd2c..cd299f2d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 favicon.*
 .htconfig.php
+.htpreconfig.php
 \#*
 include/jquery-1.4.2.min.js
 *.log
@@ -11,8 +12,8 @@ addon
 *~
 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/
@@ -22,7 +23,7 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
-#ignore OSX .DS_Store files 
+#ignore OSX .DS_Store files
 .DS_Store
 
 /nbproject/private/
@@ -33,7 +34,23 @@ 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 git projects in vendor
+vendor/**/.git