[MERGE] forward port of branch 8.0 up to 0aab81c

2015-01-19 17:15:56 +01:00
parent f6e5bf847b 0aab81cd3a
commit 18e22be138
272 changed files with 2480 additions and 1214 deletions
@@ -3,7 +3,7 @@
    <head>
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <title>OpenERP</title>
+        <title>Odoo</title>
        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
        <link rel="stylesheet" href="/web/static/src/css/full.css" />
        <script src="/web/static/lib/es5-shim/es5-shim.min.js" type="text/javascript"></script>
@@ -104,4 +104,4 @@
        <script>CFInstall.check({mode: "overlay"});</script>
        <![endif]-->
    </body>
-</html>
+</html>