projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ee30c1 9078626)
Merge branch 'upstream/saas-5' into saas-5
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 12 Jun 2014 07:57:14 +0000 (09:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 12 Jun 2014 07:57:14 +0000 (09:57 +0200)

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