Merge branch '6.1' into 6.2 · lucee/Lucee@31c6766 · GitHub

Commit

Merge branch '6.1' into 6.2

Browse files

# Conflicts:
#	core/src/main/java/resource/context/admin/debug/Modern.cfc
#	core/src/main/java/resource/context/admin/debug/Simple.cfc
#	loader/build.xml
#	loader/pom.xml

Loading branch information

michaeloffner committed Sep 6, 2024

2 parents 03feed1 + 8db9b9a commit 31c6766