Merge branch 'master' into 'apiaku'

# Conflicts:
#   app/Http/Controllers/LelongController.php
This commit is contained in:
arrahn pkb
2021-09-28 06:31:23 +00:00
3 changed files with 11 additions and 6 deletions
+2
View File
@@ -164,6 +164,8 @@ class TebusController extends Controller
public function getMoratorium(){
$bln_mora = Moratorium::first();
return response()->json($bln_mora);
}
public function updateMoratorium(Request $request){