projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d45c63 65f68c1)
Merge 'upstream/saas-4' into saas-4 saas-4
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 5 Jun 2014 12:10:20 +0000 (14:10 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 5 Jun 2014 12:10:20 +0000 (14:10 +0200)

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