Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 01:03:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wagtail-separation' into develop

Browse source
This commit is contained in:
Matt Westcott 2014-01-30 14:33:10 +00:00
commit 561835114f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/edit_handlers.py
View file

@ -13,7 +13,7 @@ import copy
from wagtail.wagtailcore.models import Page
from wagtail.wagtailcore.util import camelcase_to_underscore
from wagtail.wagtailcore.fields import RichTextArea
from cluster.forms import ClusterForm, ClusterFormMetaclass
from modelcluster.forms import ClusterForm, ClusterFormMetaclass
from taggit.forms import TagWidget
import re

2
wagtail/wagtailcore/models.py
View file

@ -7,7 +7,7 @@ from django.core.cache import cache
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import Group
from treebeard.mp_tree import MP_Node
from cluster.models import ClusterableModel
from modelcluster.models import ClusterableModel
from wagtail.wagtailsearch import Indexed, Searcher
from wagtail.wagtailcore.util import camelcase_to_underscore