[MERGE] merge trunk
bzr revid: ged@openerp.com-20131212095350-hfn21bwp031nns1m
This commit is contained in:
commit
d27b9ab563
|
@ -36,6 +36,7 @@ This module provides the core of the OpenERP Web Client.
|
|||
"static/lib/jquery.tipsy/jquery.tipsy.js",
|
||||
"static/lib/jquery.textext/jquery.textext.js",
|
||||
"static/lib/jquery.timeago/jquery.timeago.js",
|
||||
"static/lib/bootstrap/js/bootstrap.js",
|
||||
"static/lib/qweb/qweb2.js",
|
||||
"static/lib/underscore/underscore.js",
|
||||
"static/lib/underscore.string/lib/underscore.string.js",
|
||||
|
|
|
@ -17,7 +17,6 @@ Graph Views for Web Client.
|
|||
'js': [
|
||||
'static/lib/nvd3/d3.v3.js',
|
||||
'static/lib/nvd3/nv.d3.js',
|
||||
'static/lib/bootstrap/bootstrap.js',
|
||||
'static/src/js/graph.js',
|
||||
'static/src/js/pivot.js',
|
||||
'static/src/js/charts.js',
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue