projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4f0f34 52eadd5)
Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 07:12:59 +0000 (09:12 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 5 Aug 2014 07:12:59 +0000 (09:12 +0200)

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