Merge branch 'develop' of github.com:laravelcm/laravel.cm into develop

Author: mckenziearts

public/css/app.css

@@ -1,4 +1,6 @@
 /*!
+<<<<<<< HEAD
+=======
  * FilePond 4.30.4
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
@@ -23,6 +25,7 @@
  */
 
 /*!
+>>>>>>> b685f538ad416e9838d8def7efcb09ec481d8d02
  * Fuse.js v3.4.6 - Lightweight fuzzy-search (http://fusejs.io)
  * 
  * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)

public/js/app.js

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=43504a7794b645dba860c09ed89673d5",
-    "/css/app.css": "/css/app.css?id=c81faad7c99dc23b2559ae4fa79951ce"
+    "/js/app.js": "/js/app.js?id=cfb3a1c355f3a16467153c28d697dfd6",
+    "/css/app.css": "/css/app.css?id=3af27984478dd97b9f235dede4b2ea68"
 }