mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-10-26 16:02:50 -04:00
# Conflicts: # app/Http/Controllers/InvoiceController.php # resources/lang/en/texts.php # resources/views/invoices/edit.blade.php
# Conflicts: # app/Http/Controllers/InvoiceController.php # resources/lang/en/texts.php # resources/views/invoices/edit.blade.php