projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b466e6e
a66f3dd
)
[MERGE] forward port of branch saas-3 up to a66f3dd
author
Christophe Simonis
<chs@odoo.com>
Wed, 25 Jun 2014 10:33:17 +0000
(12:33 +0200)
committer
Christophe Simonis
<chs@odoo.com>
Wed, 25 Jun 2014 10:33:17 +0000
(12:33 +0200)
1
2
addons/web/static/src/js/view_list.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web_calendar/static/src/js/web_calendar.js
patch
|
diff1
|
diff2
|
blob
|
history
openerp/addons/base/ir/ir_ui_view.py
patch
|
diff1
|
diff2
|
blob
|
history
openerp/osv/fields.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/web/static/src/js/view_list.js
Simple merge
diff --cc
addons/web_calendar/static/src/js/web_calendar.js
Simple merge
diff --cc
openerp/addons/base/ir/ir_ui_view.py
Simple merge
diff --cc
openerp/osv/fields.py
Simple merge