summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-06-03 19:14:22 +0200
committerChristophe Simonis <chs@odoo.com>2014-06-03 19:14:22 +0200
commit65f68c1f653a9f491cded87cd223949cc2c02493 (patch)
tree5a3872173c1e6cebbf6bcf7838d768da24cb3d5c /.gitignore
parenteafa5ff0b59dcde001200633b1c585abd3849671 (diff)
parent7dd69540e8ee223a2d14b00f8435fd08e935b170 (diff)
[MERGE] forward port of branch saas-3 up to 7dd6954
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4b38dc02ac7..4c3277c5215 100644
--- 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