mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-07 21:44:51 +00:00
fix merge conflicts
This commit is contained in:
@@ -148,7 +148,8 @@ class CompanyController extends Controller
|
||||
["code"=>"fr", "name" => "French"],
|
||||
["code"=>"es", "name" => "Spanish"],
|
||||
["code"=>"ar", "name" => "العربية"],
|
||||
["code"=>"de", "name" => "German"]
|
||||
["code"=>"de", "name" => "German"],
|
||||
["code"=>"pt_BR", "name" => "Brazilian Portuguese"],
|
||||
];
|
||||
|
||||
return response()->json([
|
||||
|
||||
Reference in New Issue
Block a user