~savoirfairelinux-openerp/openobject-addons/7.0-bug-1168398-tta+afe+vv
Viewing all changes in revision 9051.
-
Committer:
Vincent Vinet
-
Date:
2014-07-03 17:36:30 UTC
-
Revision ID:
vincent.vinet@savoirfairelinux.com-20140703173630-3w5cl0npx7ea3hdy
fix merge conflict
expand all
collapse all
Show diffs side-by-side
added
removed