projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa1e5f6
0f2d7e4
)
[Merge]Merge with trunk
author
Mahendra Barad (OpenERP)
<mba@tinyerp.com>
Wed, 22 Jan 2014 10:01:09 +0000
(15:31 +0530)
committer
Mahendra Barad (OpenERP)
<mba@tinyerp.com>
Wed, 22 Jan 2014 10:01:09 +0000
(15:31 +0530)
bzr revid: mba@tinyerp.com-
20140122100109
-woxq4e1fhnhsr1xz
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
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
projects / odoo / odoo.git / commitdiff