Conflicts: app/Http/Controllers/BookController.php resources/lang/en/common.php resources/views/books/create.blade.php resources/views/books/form.blade.php resources/views/books/index.blade.php resources/views/users/edit.blade.php tests/Entity/EntityTest.php |
||
---|---|---|
.. | ||
activities.php | ||
auth.php | ||
common.php | ||
components.php | ||
entities.php | ||
errors.php | ||
pagination.php | ||
passwords.php | ||
settings.php | ||
validation.php |