changeset 6069:0e1b5fdca6bc

Merge upstream.
author 'Karl O. Pinc' <kop@meme.com>
date Mon, 15 Sep 2014 12:02:20 -0500
parents 4dbfb3fec02a (current diff) 5fb9d0f4af89 (diff)
children 2e0530a78920
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Thu Sep 04 14:48:36 2014 -0500
+++ b/MoinMoin/config/multiconfig.py	Mon Sep 15 12:02:20 2014 -0500
@@ -560,7 +560,8 @@
             'page_front_page', 'page_category_regex', 'page_dict_regex',
             'page_group_regex', 'page_template_regex', 'page_license_page',
             'page_local_spelling_words', 'acl_rights_default',
-            'acl_rights_before', 'acl_rights_after', 'mail_from'
+            'acl_rights_before', 'acl_rights_after', 'mail_from',
+            'quicklinks_default', 'subscribed_pages_default', 
             )
 
         for name in decode_names: