From: Abijeet Patro <redacted>
Date: Sun, 18 Mar 2018 18:14:33 +0000 (+0530)
Subject: Merge branch 'master' into bug/image-upload
X-Git-Tag: v0.20.1~1^2~9^2^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/754/head?hp=--cc

Merge branch 'master' into bug/image-upload
---

0335f584783ee5a892aba751e27ce95e7b9921c3
diff --cc app/Http/Controllers/ImageController.php
index 17e690813,d71e38346..9782a94c4
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@@ -120,7 -120,7 +120,7 @@@ class ImageController extends Controlle
      {
          $this->checkPermission('image-create-all');
          $this->validate($request, [
-             'file' => 'image'
 -            'file' => 'required|is_image'
++            'file' => 'required|image'
          ]);
  
          if (!$this->imageRepo->isValidType($type)) {