projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ecdbc5 670c6b4)
Merge pull request #82 from alhashash/ocb-7.0-fix_conflict_3e1d5be951
authorPedro M. Baeza <pedro.baeza@gmail.com>
Fri, 7 Nov 2014 02:33:08 +0000 (03:33 +0100)
committerPedro M. Baeza <pedro.baeza@gmail.com>
Fri, 7 Nov 2014 02:33:08 +0000 (03:33 +0100)
[FIX] Fix incorrect merge 3e1d5be951fb8


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.