[MERGE] Merge parents

bzr revid: rim@openerp.com-20140120161421-oracyb444978x4rp
2014-01-20 17:14:21 +01:00
parent 108d9d258d 4d6e7e2d2e
commit 59271857fc
1 changed files with 1 additions and 1 deletions
@@ -31,7 +31,7 @@ NOPE = object()
 MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)

 class Website(openerp.addons.web.controllers.main.Home):
-    @http.route(['/', '/2'], type='http', auth="public", website=True, multilang=True)
+    @http.route('/', type='http', auth="public", website=True, multilang=True)
    def index(self, **kw):
        try:
            main_menu = request.registry['ir.model.data'].get_object(request.cr, request.uid, 'website', 'main_menu')