Skip to content

Commit

Permalink
Merge branch '6.2' into 7.0
Browse files Browse the repository at this point in the history 
# Conflicts:
#	core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
#	loader/build.xml
#	loader/pom.xml
  • Loading branch information
@michaeloffner
michaeloffner committed Dec 12, 2024
2 parents 51cdefd + 36fd59b commit 9c8b38e
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9c8b38e

Please sign in to comment.