Merge branch 'master' into php8

2021-10-07 22:17:11 +02:00
parent 09133f4f10 c5fd6028b5
commit 3f469f715f
119 changed files with 6872 additions and 790 deletions
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,11 @@
 	"require" : {
 		"php" : "^5.6.0 || ^7.0 || ^8.0",
 		"paragonie/random_compat" : "<9.99",
-		"yzalis/identicon" : "^2.0.0"
+		"yzalis/identicon" : "^2.0.0",
+		"mlocati/ip-lib" : "1.14.0"
+	},
+	"suggest" : {
+		"google/cloud-storage" : "1.23.1"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "^9"
@@ -39,4 +43,4 @@
 	"config" : {
 		"autoloader-suffix" : "DontChange"
 	}
-}
+}