projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ae6b90 029e230)
[MERGE] Sync with website-al
authorThibault Delavallée <tde@openerp.com>
Thu, 23 Jan 2014 13:42:53 +0000 (14:42 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 23 Jan 2014 13:42:53 +0000 (14:42 +0100)
bzr revid: tde@openerp.com-20140123134253-z5vee6c8fmbgdyq1

1  2 
addons/website_payment/__openerp__.py patch | diff1 | diff2 | blob | history

diff --cc addons/website_payment/__openerp__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.