Viewing all changes in revision 3932.
- Committer: Paramjit Singh Sahota
- Date: 2014-03-05 08:46:13 UTC
- mfrom: (3929.2.21 trunk)
- Revision ID: psa@tinyerp.com-20140305084613-p1opa8nr2lmpk390
[MERGE] Merged lp:openerp-web.
- addons/web/static/lib/bootstrap/fonts
- addons/web/static/lib/bootstrap/fonts/bootstrap
- addons/web/static/lib/bootstrap/javascripts
- addons/web/static/lib/bootstrap/javascripts/bootstrap
- addons/web/static/lib/bootstrap/stylesheets
- addons/web/static/lib/bootstrap/stylesheets/bootstrap
- addons/web_tests_demo/tests
- files modified:
- addons/web/controllers/main.py
expand all
collapse all
added
removed
addons/web/static/lib/bootstrap/fonts/bootstrap/glyphicons-halflings-regular.svg
addons/web/static/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
addons/web/static/src/img/throbber-large.gif
