projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7c647ec
7ecaab9
)
[MERGE] forward port of branch saas-4 up to 7ecaab9
author
Denis Ledoux
<dle@odoo.com>
Mon, 11 Aug 2014 13:31:04 +0000
(15:31 +0200)
committer
Denis Ledoux
<dle@odoo.com>
Mon, 11 Aug 2014 13:31:04 +0000
(15:31 +0200)
1
2
addons/web/static/src/css/base.css
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/css/base.sass
patch
|
diff1
|
diff2
|
blob
|
history
addons/web/static/src/js/view_form.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/web_kanban/static/src/js/kanban.js
patch
|
diff1
|
diff2
|
blob
|
history
addons/website/controllers/main.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/web/static/src/css/base.css
Simple merge
diff --cc
addons/web/static/src/css/base.sass
Simple merge
diff --cc
addons/web/static/src/js/view_form.js
Simple merge
diff --cc
addons/web_kanban/static/src/js/kanban.js
Simple merge
diff --cc
addons/website/controllers/main.py
Simple merge
projects / odoo / odoo.git / commitdiff