Merge tag '4.7.17.5' into develop

4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
This commit is contained in:
James Cole
2019-08-02 20:59:57 +02:00
6 changed files with 15 additions and 7 deletions

View File

@@ -16,7 +16,6 @@
<h3 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3>
</div>
<div class="box-body">
<p>
{# ONE: WITHDRAWAL TO DEPOSIT #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}