Merge pull request #2236 from tobiasd/20160103a

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 06dc807bd5444f7e5140655f743bb28f446a69f2..b300f579e299ab2526462792c2ac1bf03a338c83 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,11 @@ 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