Merge remote-tracking branch 'origin/master' into issue469_budget

This commit is contained in:
2022-03-01 15:42:59 +01:00
5 changed files with 6 additions and 16 deletions

View File

@@ -8,7 +8,7 @@
{% endif %}
{% if entity.updatedBy != null %}
{% if entity.updatedAt != null %}
{{ ', ' ~ 'by_user'|trans }}
{{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %}
{{ 'Last updated by'|trans }}
{% endif %}
@@ -29,7 +29,7 @@
{% endif %}
{% if entity.createdBy != null %}
{% if entity.createdAt != null %}
{{ ', ' ~ 'by_user'|trans }}
{{ ', ' }}<br>{{ 'by_user'|trans }}
{% else %}
{{ 'Created by'|trans }}
{% endif %}