Merge branch 'zyxxyzyxz-master' into develop

Author: rappasoft

composer.json

@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": "^7.2.5",
-        "livewire/livewire": "^1.3"
+        "livewire/livewire": "^1.3|^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",