mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-14 15:13:29 +01:00
0dcee794b5
Conflicts: resources/lang/en/texts.php resources/views/accounts/invoice_design.blade.php resources/views/invoices/edit.blade.php |
||
---|---|---|
.. | ||
pagination.php | ||
passwords.php | ||
reminders.php | ||
texts.php | ||
validation.php |