kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'apifix' into develop

Browse Source 
* apifix:
  Fix issues with API authentication.

# Conflicts:
#	app/Api/V1/Controllers/BillController.php
#	app/Http/Middleware/HttpBinder.php
#	app/Transformers/AttachmentTransformer.php
#	app/Transformers/BillTransformer.php
#	app/Transformers/NoteTransformer.php
#	routes/api.php
This commit is contained in:
James Cole
2018-02-09 14:57:39 +01:00
parent d4a84ed198 d393c693de
commit d2a8819dd4
6 changed files with 104 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Bill.php
View File

@@ -29,7 +29,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Watson\Validating\ValidatingTrait;
use Illuminate\Contracts\Auth\Factory as Auth;
/**
* Class Bill.
*/