projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ed0536 5bf1608)
[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Wed, 12 Mar 2014 15:29:42 +0000 (16:29 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 12 Mar 2014 15:29:42 +0000 (16:29 +0100)
bzr revid: fme@openerp.com-20140312152942-egbzui0drs85wt7i

1  2 
addons/auth_oauth/controllers/main.py patch | diff1 | diff2 | blob | history

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