diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:11:38 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-19 11:11:38 +0530 |
| commit | 4346af9c96ddc0e88d2d55d47ee0c4e21865aa2d (patch) | |
| tree | 24feb522a8d01a5babe5a5a6fde7cc1c77b7de25 /addons/web/controllers/__init__.py | |
| parent | 3646b669516f78aa0a1be69ca8a241468cc9d98b (diff) | |
| parent | 37209eb5e76a7b373a0f302e1f62be32fd2f37d2 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121119054138-lkrx5jo1tgbr71ek
Diffstat (limited to 'addons/web/controllers/__init__.py')
| -rw-r--r-- | addons/web/controllers/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/web/controllers/__init__.py b/addons/web/controllers/__init__.py index 12a7e529b67..74c27518ece 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -1 +1,2 @@ from . import main +from . import testing |