mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-13 14:42:42 +01:00
c7c253fbd8
Conflicts: app/Http/routes.php app/Ninja/PaymentDrivers/BasePaymentDriver.php composer.lock resources/lang/en/texts.php resources/views/reports/chart_builder.blade.php |
||
---|---|---|
.. | ||
pagination.php | ||
passwords.php | ||
reminders.php | ||
texts.php | ||
validation.php |