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  | 
			||
|---|---|---|
| .. | ||
| Auth | ||
| Entity | ||
| Permissions | ||
| test-data | ||
| ActivityTrackingTest.php | ||
| AttachmentTest.php | ||
| BrowserKitTest.php | ||
| CommandsTest.php | ||
| CreatesApplication.php | ||
| HomepageTest.php | ||
| ImageTest.php | ||
| LanguageTest.php | ||
| PublicActionTest.php | ||
| TestCase.php | ||
| UserProfileTest.php | ||