-
Committer:
niv-openerp
-
Date:
2011-03-09 14:29:07 UTC
-
Revision ID:
nicolas.vanhoren@openerp.com-20110309142907-mi487dix97oz43wq
Fixed incorrect merge in 4445 that overrided some files. Restored previous fix with custom filters.
------------- This line and the following will be ignored --------------
modified:
addons/openerp/controllers/search.py
addons/openerp/static/javascript/search.js
unknown:
openerp/
tmp.diff
addons/web_livechat/
addons/openerp/static/javascript/search..bak.js