Merge branch '7.0' into 7.1

alex-kulakov · alex-kulakov · commit 105c33657ff9 · 2025-09-16T12:25:31.000+05:00
# Conflicts:
#	Containers/firebird/init-firebird-instance.sh
diff --git a/Containers/firebird/init-firebird-instance.sh b/Containers/firebird/init-firebird-instance.sh
@@ -4,4 +4,4 @@ set -u
 
 
 /opt/firebird/bin/registerDatabase.sh "dotest" "$FIREBIRD_DATABASE"
-echo "Register aliases with default settings for databasees"
+echo "Register aliases with default settings for databases"

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ set -u`
`4`	`4`
`5`	`5`
`6`	`6`	`/opt/firebird/bin/registerDatabase.sh "dotest" "$FIREBIRD_DATABASE"`
`7`		`-echo "Register aliases with default settings for databasees"`
	`7`	`+echo "Register aliases with default settings for databases"`