Merge branch 'master' into v2.1

author Mike Pall <mike>

Sat, 12 Aug 2023 20:20:33 +0000 (22:20 +0200)

committer Mike Pall <mike>

Sat, 12 Aug 2023 20:20:33 +0000 (22:20 +0200)
author Mike Pall <mike>
Sat, 12 Aug 2023 20:20:33 +0000 (22:20 +0200)
committer Mike Pall <mike>
Sat, 12 Aug 2023 20:20:33 +0000 (22:20 +0200)
diff --cc src/lj_parse.c
Simple merge
diff --cc src/lj_record.c
Simple merge
		1	2
src/lj_parse.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_record.c	patch \|	diff1 \|	diff2 \|	blob \| history