mirror of
				https://github.com/firefly-iii/firefly-iii.git
				synced 2025-10-31 02:36:28 +00:00 
			
		
		
		
	Merge tag '4.7.17.5' into develop
4.7.17.5 # Conflicts: # resources/views/v1/transactions/convert.twig
This commit is contained in:
		| @@ -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' %} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user