summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-03-16 15:21:06 +0100
committerChristophe Simonis <chs@odoo.com>2016-03-16 15:30:03 +0100
commita34d49606956d1ad12a86c928eefe1468a512866 (patch)
tree863c6e8e4b9f3ede0764c451bb18ef2fad08f7c8 /addons/web/static/src/js/framework
parent0ec5456e633ada5b55ef4d711a2cd3073391ef9d (diff)
parent1431ba2f9b1c58d3b33ae69bc6d81864f885b666 (diff)
[MERGE] forward port of branch saas-6 up to 1431ba2
Also include 2939800ed438505be9c919d4edca0ce624e6bf8e which seems to have been forgotten during previous forward-ports
Diffstat (limited to 'addons/web/static/src/js/framework')
0 files changed, 0 insertions, 0 deletions