Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-07 15:25:00 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge conflicts fixed

Browse Source
This commit is contained in:
Julie Lenaerts
2022-02-04 10:25:46 +01:00
parent b87f14255d 2343a4a334
commit 481456a038
403 changed files with 15524 additions and 2846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig
View File

@@ -99,7 +99,7 @@
<div class="item-col">
{% if options['isConfidential'] %}
<div class="confidential">
<div class="confidential-content blur">
<div class="confidential-content">
<ul class="list-content fa-ul">
<li>
{{ thirdparty.getAddress|chill_entity_render_box({