Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Minik Gaarde Lambrecht 2021-03-26 10:24:54 +01:00
commit 0131511be1
2 changed files with 6 additions and 4 deletions

View File

@ -10,6 +10,6 @@
"Backend/Models"
]
},
"name": "",
"description": ""
"name": "sde_skp/game_jaming",
"description": "description"
}

6
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ad0077c071ef4b41a72fb0922a0643e4",
"content-hash": "f7278c3dc731961ed65f3f31bf2b49f0",
"packages": [
{
"name": "doctrine/inflector",
@ -1626,7 +1626,9 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"ext-mysqli": "*"
"ext-mysqli": "*",
"ext-sqlite3": "*",
"ext-fileinfo": "*"
},
"platform-dev": [],
"plugin-api-version": "2.0.0"