projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2f1f34 9a7f48a)
Forward port of branch saas-5 up to 9a7f48a
authorMartin Trigaux <mat@openerp.com>
Tue, 2 Sep 2014 12:50:51 +0000 (14:50 +0200)
committerMartin Trigaux <mat@openerp.com>
Tue, 2 Sep 2014 12:50:51 +0000 (14:50 +0200)
1  2 
addons/gamification/models/badge.py patch | diff1 | diff2 | blob | history
addons/web/static/src/js/view_form.js patch | diff1 | diff2 | blob | history

diff --cc addons/gamification/models/badge.py
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.