summaryrefslogtreecommitdiff
path: root/addons/website_blog/__init__.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-09-20 16:27:01 +0200
committerThibault Delavallée <tde@openerp.com>2013-09-20 16:27:01 +0200
commit4f1cdefa8ddf4e1a295712e09e562418153f6ab5 (patch)
treeaf9fc93a3794cc820e05614297c03ebb31e6cf1a /addons/website_blog/__init__.py
parent835bad4386ecd4a2b7ed5666e22e3100a3b21f09 (diff)
[REF] document_page, website_blog: merge of the two modules.
document_page is now contained inside website_blog, last part of the refactoring before cleaning and improving the blog feature. Usefull files have been transfered. Translations have been discarded, they will have to be re-translated again. Document_page module is now dead. Long live website_blog! Misc: - some fixes in website_blog and wizard - commented some sections of yml tests because they should not apply anymore - added empty files for python unit tests in website_blog bzr revid: tde@openerp.com-20130920142701-4lp1my3ajga2puxl
Diffstat (limited to 'addons/website_blog/__init__.py')
-rw-r--r--addons/website_blog/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website_blog/__init__.py b/addons/website_blog/__init__.py
index 85599508fdd..8b6698d444e 100644
--- a/addons/website_blog/__init__.py
+++ b/addons/website_blog/__init__.py
@@ -20,5 +20,6 @@
##############################################################################
import controllers
-import document_page
+import website_blog
import res_config
+import wizard