Merge branch 'upstream/saas-5' into saas-5

[odoo/odoo.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6148a29..4c3277c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ _build/
 
 # dotfiles
 .*
+!.gitignore
 # compiled python files
 *.py[co]
 # setup.py egg_info
@@ -12,7 +13,8 @@ _build/
 # hg stuff
 *.orig
 status
-
+# odoo filestore
+openerp/filestore
 # generated for windows installer?
 install/win32/*.bat
 install/win32/meta.py
@@ -25,4 +27,4 @@ install/win32/meta.py
 /lib/
 /man/
 /share/
-/src/
+/src/
\ No newline at end of file