Viewing all changes in revision 3746.
- Committer: Chirag Dodiya(OpenERP)
- Date: 2014-03-04 12:36:15 UTC
- mfrom: (3708.1.242 trunk)
- Revision ID: cod@tinyerp.com-20140304123615-4b4od0ueau5t33u9
[MRG]Merge with trunk
- 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
