Merge https://github.com/friendica/friendica into pull

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 358114a44481357fd2f6e4a8bb4f134fcde35b85..038ac32a55b0e4205b3f7b862b12ba3efaee9d3e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,11 @@ report/
 #ignore OSX .DS_Store files \r
 .DS_Store\r
 \r
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/\r
+\r
+#ignore smarty cache\r
+/view/smarty3/compiled/\r
+\r
+#ignore cache folders\r
+/privacy_image_cache/\r
+/photo/\r