Merge branch 'main' into develop

This commit is contained in:
James Cole
2023-12-02 07:06:43 +01:00

12
composer.lock generated
View File

@@ -4395,16 +4395,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.33",
"version": "3.0.34",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0"
"reference": "56c79f16a6ae17e42089c06a2144467acc35348a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/33fa69b2514a61138dd48e7a49f99445711e0ad0",
"reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a",
"reference": "56c79f16a6ae17e42089c06a2144467acc35348a",
"shasum": ""
},
"require": {
@@ -4485,7 +4485,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.33"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.34"
},
"funding": [
{
@@ -4501,7 +4501,7 @@
"type": "tidelift"
}
],
"time": "2023-10-21T14:00:39+00:00"
"time": "2023-11-27T11:13:31+00:00"
},
{
"name": "pragmarx/google2fa",