diff --git a/doc/howto/howto_website/templates-basic b/doc/howto/howto_website/templates-basic index 2fb934bdbb0..a5b14a3fbc1 100644 --- a/doc/howto/howto_website/templates-basic +++ b/doc/howto/howto_website/templates-basic @@ -1,5 +1,5 @@ # HG changeset patch -# Parent c6916a09fd20a67c210369676c78f23704870c8e +# Parent 2edbac8244a982055a6786c14ee41719ea5410e8 diff --git a/__openerp__.py b/__openerp__.py --- a/__openerp__.py diff --git a/doc/howto/howto_website/url-pattern b/doc/howto/howto_website/url-pattern index 57f04753d74..7772a0653d7 100644 --- a/doc/howto/howto_website/url-pattern +++ b/doc/howto/howto_website/url-pattern @@ -1,5 +1,5 @@ # HG changeset patch -# Parent f7adcd9a5a8e0dc1c7438f94dde2faefd6406a30 +# Parent b82b9012736b3d8e0bc7f6325f47cb2fb86f475d diff --git a/controllers/academy.py b/controllers/academy.py --- a/controllers/academy.py @@ -13,7 +13,7 @@ diff --git a/controllers/academy.py b/controllers/academy.py for i, ta in enumerate(teaching_assistants) ] -@@ -39,7 +39,7 @@ class academy(main.Home): +@@ -32,7 +32,7 @@ class academy(main.Home): 'tas': '\n'.join(tas) } @@ -22,7 +22,7 @@ diff --git a/controllers/academy.py b/controllers/academy.py def ta(self, id): return """ -@@ -51,4 +51,4 @@ class academy(main.Home): +@@ -44,4 +44,4 @@ class academy(main.Home):

%(name)s