merge default doc-dc
authorDamien Correia
Wed, 13 Jun 2018 17:47:03 +0200
branchdoc-dc
changeset 696 575e1e8341c3
parent 668 a63bc2aa60bb (diff)
parent 672 adff375e9deb (current diff)
child 697 16c83f565a48
merge default
src/pyams_content/portlet/content/interfaces.py
src/pyams_content/shared/imagemap/zmi/templates/paragraph-render.pt
src/pyams_content/shared/imagemap/zmi/templates/render.pt
src/pyams_content/shared/view/portlet/templates/view-items-list.pt
src/pyams_content/shared/view/portlet/templates/view-with-images-list.pt