projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7556242 f469fc2)
Merge branch 'upstream/saas-5' into saas-5
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 16 Jun 2014 07:44:39 +0000 (09:44 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 16 Jun 2014 07:44:39 +0000 (09:44 +0200)

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