Cavemanon/cavemanon-wagtail-personalisation
Archived
7
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' into feature/WXP-53-front-end-segment-bouwer

Browse Source 
# Conflicts:
#	src/personalisation/wagtail_hooks.py
This commit is contained in:
Jasper Berghoef
2016-11-08 14:54:28 +01:00
parent b07d01e4ea c659617872
commit b1c39fd8ad
11 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/personalisation/wagtail_hooks.py
View File

@ -1,15 +1,21 @@
from django.conf import settings
from django.conf.urls import include, url
from django.core.urlresolvers import reverse
<<<<<<< HEAD
from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
from personalisation import admin_urls
=======
>>>>>>> master
from wagtail.contrib.modeladmin.helpers import ButtonHelper
from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore import hooks
from personalisation import admin_urls
from personalisation.models import Segment