diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-02-15 10:59:40 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-02-15 10:59:40 +0100 |
| commit | bc233c30e5b9d28c9576b50c6f75dadbdf2e35ea (patch) | |
| tree | ffadfea5a36040b12635e11acdc4237d5a953db8 /addons/web/controllers/__init__.py | |
| parent | 5ab1b4f37ef93952567939444196cd9a91b92f02 (diff) | |
| parent | 750c5db2a30f89593cbd64137e765b11d5226808 (diff) | |
[FIX] Merge last trunk
bzr revid: fme@openerp.com-20120215095940-2jv27t91i7u5mm0r
Diffstat (limited to 'addons/web/controllers/__init__.py')
| -rw-r--r-- | addons/web/controllers/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/__init__.py b/addons/web/controllers/__init__.py index 8ee9bae18d9..12a7e529b67 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -1 +1 @@ -import main +from . import main |