Merge remote-tracking branch 'origin/master'

# Conflicts: # skolehjem/app/Notifications/PushNews.php
2021-05-10 12:18:21 +02:00
parent 3908a6b00c 4e8e2831da
commit d1b083bae1
21 changed files with 102 additions and 65 deletions
@@ -162,7 +162,6 @@ class EventController extends Controller
     */
    public function update(Request $request, $id)
    {
-
        $data = $request->all();

        $event = Event::find($id);