Merge branch 'multiarch' into java8-multiarch

# Conflicts:
#	Dockerfile
#	start-configuration
This commit is contained in:
Geoff Bourne committed 2021-05-14 17:59:49 -05:00
commit 4fb791b490
19 files changed
+148 -178

No files matched your search

+1 -1
View File
@@ -109,7 +109,7 @@ case "${TYPE^^}" in
exec ${SCRIPTS:-/}start-deployFTBA "$@"
;;
CURSEFORGE|FTB)
FTB|CURSEFORGE)
exec ${SCRIPTS:-/}start-deployCF "$@"
;;