Merge origin/main into main

# Conflicts:
#	composer.json
This commit is contained in:
2026-06-12 13:08:30 -04:00
parent 8200ee5d71
commit ada82580a2
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "potter/uri", "name": "potter/uri",
"description": "Potter Framework Uri Interface", "description": "Potter Framework Uri Implementation",
"type": "library", "type": "library",
"require": { "require": {
"php": "^8.5", "php": "^8.5",