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

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bf4bd454b140036f74d53acfd5c1093ea19d2d12..25e071016730b1db7a0fc29a2ac725e2252274d0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 favicon.*\r
 .htconfig.php\r
+.htpreconfig.php\r
 \#*\r
 include/jquery-1.4.2.min.js\r
 *.log\r
@@ -11,8 +12,8 @@ addon
 *~\r
 robots.txt\r
 \r
-#ignore documentation, it should be newly built \r
-doc/api\r
+#ignore documentation, it should be newly built\r
+doc/html\r
 \r
 #ignore reports, should be generted with every build\r
 report/\r
@@ -22,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
@@ -33,3 +34,16 @@ report/
 #ignore cache folders\r
 /privacy_image_cache/\r
 /photo/\r
+/proxy/\r
+nbproject\r
+\r
+#ignore vagrant dir\r
+.vagrant/\r
+\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