Merge branch 'develop'

This commit is contained in:
Dennis
2021-06-17 09:18:34 +02:00
4 changed files with 405 additions and 322 deletions

View File

@@ -9,7 +9,7 @@
],
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"ext-json": "*",
"cloudflare/sdk": "^1.1",
"fideloper/proxy": "^4.2",
@@ -20,7 +20,7 @@
"laravel/framework": "^8.4",
"laravel/horizon": "^5.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.1",
"laravel/ui": "^2.1|^3.3.0",
"league/glide": "^1.6",
"pragmarx/google2fa-laravel": "^1.3",
"predis/predis": "^1.1",

719
composer.lock generated

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=341394f05bad274130fe",
"/app.js": "/app.js?id=d33e0bb4038cbbc2466e",
"/app-dark.css": "/app-dark.css?id=ade35296e4fa0c99a758",
"/app.css": "/app.css?id=c14814cc1a7a4f298934",
"/img/favicon.png": "/img/favicon.png?id=1542bfe8a0010dcbee71"