Merge remote-tracking branch 'origin/v2.x' into v2.x

# Conflicts: # README.md
crocodile2u · Sep 14, 2021 · 91e5753 · 91e5753
2 parents dd132d8 + 9532541
commit 91e5753
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -79,4 +79,4 @@ composer run-script generate -- \
 ```
 
 Hear, the KEY & SALT are valid for the imgproxy instance started by provided `docker-compose.yml`.
-You can also test URL generation for arbitrary custom imgproxy installation by providing relevant `base`, `key` & `salt`. Happy testing!
+You can also test URL generation for arbitrary custom imgproxy installation by providing relevant `base`, `key` & `salt`. Happy testing!