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

This commit is contained in:
Eric Espie
2022-08-09 17:11:34 +02:00
43 changed files with 623 additions and 485 deletions

View File

@@ -27,7 +27,9 @@
<attribute id="ref"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="ref"/>
@@ -393,7 +395,9 @@
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="ticket_id"/>