[FIX] last merge

Browse Source

bzr revid: rco@openerp.com-20120628145821-brxl5tpyrjg91wnl

...

This commit is contained in:

Raphael Collet

2012-06-28 16:58:21 +02:00

parent 2963e31ebf

commit 5b71d65450

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available