Viewing all changes in revision 3827.
- Committer: openerp-sle
- Date: 2014-01-31 10:29:38 UTC
- mfrom: (3776.1.149 openerp-web)
- Revision ID: openerp-sle@openerp-sle.home-20140131102938-34avvpqmea7e2wv2
[MERGE]Â trunk
- files added:
- addons/web_graph/static/lib/nvd3
- files removed:
- addons/web/tests/test_dataset.py
- addons/web_graph/static/lib/flotr2
- addons/web_graph/static/lib/flotr2/dev
- addons/web_graph/static/lib/flotr2/js
- addons/web_graph/static/lib/flotr2/js/plugins
- addons/web_graph/static/lib/flotr2/js/types
- addons/web_graph/static/lib/flotr2/lib
- addons/web_graph/static/lib/flotr2/lib/jasmine
- files modified:
- addons/web/controllers/main.py
expand all
collapse all
added
removed
addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
