[MERGE] From odoo/odoo#master - no-op because patches were applied on both sides

Browse Source

Just establishes a common ancestor for all descendants on both sides

...

This commit is contained in:

Olivier Dony

2015-06-10 13:04:42 +02:00

parent 0ce3853c8c 4bef17cc55

commit 4703b8df9c

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