projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10d3dd4 d64b172)
sync with 7.0
authorMartin Trigaux <mat@openerp.com>
Fri, 25 Apr 2014 11:35:55 +0000 (13:35 +0200)
committerMartin Trigaux <mat@openerp.com>
Fri, 25 Apr 2014 11:35:55 +0000 (13:35 +0200)
bzr revid: mat@openerp.com-20140425113555-nkjxldq61io6kvdo

1  2 
addons/web/static/src/js/views.js patch | diff1 | diff2 | blob | history

diff --cc addons/web/static/src/js/views.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.