projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5023816
e5533d0
)
[MERGE] forward port of branch 7.0 up to e5533d0
author
Christophe Simonis
<chs@odoo.com>
Thu, 19 Jun 2014 13:32:32 +0000
(15:32 +0200)
committer
Christophe Simonis
<chs@odoo.com>
Thu, 19 Jun 2014 13:32:32 +0000
(15:32 +0200)
1
2
addons/mrp/mrp.py
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/formats.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/search.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/view_form.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/view_list_editable.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/mrp/mrp.py
Simple merge
diff --cc
addons/web/static/src/js/formats.js
Simple merge
diff --cc
addons/web/static/src/js/search.js
Simple merge
diff --cc
addons/web/static/src/js/view_form.js
Simple merge
diff --cc
addons/web/static/src/js/view_list_editable.js
Simple merge
projects / odoo / odoo.git / commitdiff