Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter

This commit is contained in:
Nicolas Maillat
2019-06-11 17:22:29 +02:00
committed by GitHub
224 changed files with 27587 additions and 16053 deletions

View File

@@ -19,7 +19,7 @@
{% if context == 'Push' %}
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/push-icon.png"/>
{% else %}
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/validation.png"/>
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/feedback-icon.png"/>
{% endif %}
</div>
<div class="PNB content" style="top:45px; overflow-y:auto;">