7

Merge branch 'develop' into feature/djangoconf-sprint

This commit is contained in:
Paul J Stevens
2018-05-26 10:48:33 +02:00
35 changed files with 1400 additions and 106 deletions

View File

@ -3,11 +3,11 @@ from __future__ import absolute_import, unicode_literals
import logging
from django.conf.urls import include, url
from django.urls import reverse
from django.template.defaultfilters import pluralize
from django.urls import reverse
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from wagtail.admin.site_summary import SummaryItem, PagesSummaryItem
from wagtail.admin.site_summary import PagesSummaryItem, SummaryItem
from wagtail.admin.widgets import Button, ButtonWithDropdownFromHook
from wagtail.core import hooks
from wagtail.core.models import Page