diff options
| author | Tejas Tank <tta@openerp.com> | 2012-04-27 14:21:03 +0530 |
|---|---|---|
| committer | Tejas Tank <tta@openerp.com> | 2012-04-27 14:21:03 +0530 |
| commit | ae848b7fd9628a0385fd2b1f6bb5d62c8bd2f864 (patch) | |
| tree | bd04f21be7f64f2945961fbaba2cd4c8b13924a1 /addons/web_etherpad/__init__.py | |
| parent | 7de8c025023aa063b204d0b7679e0925ec133405 (diff) | |
| parent | 8d240b5775da32dc41bb0d9b5fc7255d1b49ea78 (diff) | |
merge with pad module and latest trunk too
bzr revid: tta@openerp.com-20120427085103-s2nf391at3nsmbdg
Diffstat (limited to 'addons/web_etherpad/__init__.py')
| -rw-r--r-- | addons/web_etherpad/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/addons/web_etherpad/__init__.py b/addons/web_etherpad/__init__.py deleted file mode 100644 index df35bc32106..00000000000 --- a/addons/web_etherpad/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# -*- coding: utf-8 -*- -import res_company |