Merge branch 'contrib'

[core.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b2e94f16824cb156ca530dfc02186d89ac75f910..fd0d0d9f1abfe1ac03583452cbeb1e908278c421 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-lfdb2/*.bin*
-lfdb2/*.out*
-mindmaps/*.png
-mindmaps/*.svg
+contrib/lfdb2/*.bin*
+contrib/lfdb2/*.out*
+contrib/mindmaps/*.png
+contrib/mindmaps/*.svg
+inc/config/config-local.php
+/nbproject
+templates/_compiled/*.*
+templates/images/_cache/*.*