mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-23 01:41:34 +02:00
f42e8158c2
Conflicts: app/Http/Controllers/AccountController.php app/Http/routes.php app/Models/User.php resources/lang/en/texts.php |
||
---|---|---|
.. | ||
pagination.php | ||
passwords.php | ||
reminders.php | ||
texts.php | ||
validation.php |