Merge pull request #4701 from tobiasd/20180328-msg

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 06dc807bd5444f7e5140655f743bb28f446a69f2..8d86b95875c44d3b384f3f98bce53ee9e8ad2d2a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,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
@@ -23,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
@@ -34,7 +34,27 @@ 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
+/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
\ No newline at end of file