composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	sources/SessionTracker/iSessionHandlerExtension.php
This commit is contained in:
jf-cbd
2025-09-05 15:19:38 +02:00
parent 44972f34e5 65c9145b10
commit 2ee68ff819
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/datamodel/ActionEmail/email-notification-preview.html.twig
View File

@@ -3,7 +3,7 @@
<div id="branding-error-alert-content">
<div style="display:flex;flex-align: stretch;">
<div style="margin-right:1em"><span class="fas fa-2x fa-exclamation-triangle"></span></div>
<div>{{ 'ActionEmail:preview_warning'|dict_s }}<br/>{{ 'ActionEmail:preview_more_info'|dict_format('<a href="https://www.caniemail.com" target="_blank">www.canimeail.com</a>')|raw }}</div>
<div>{{ 'ActionEmail:preview_warning'|dict_s }}<br/>{{ 'ActionEmail:preview_more_info'|dict_format('<a href="https://www.caniemail.com" target="_blank">www.caniemail.com</a>')|raw }}</div>
</div>
</div>
{% EndUIAlert %}