Merge remote-tracking branch 'origin/3.1.x' into 3.1.x · ezylang/EvalEx@3725c84 · GitHub

Commit

Merge remote-tracking branch 'origin/3.1.x' into 3.1.x

Browse files

# Conflicts:
#	src/main/java/com/ezylang/evalex/data/DefaultEvaluationValueConverter.java
#	src/test/java/com/ezylang/evalex/data/EvaluationValueTest.java
#	src/test/java/com/ezylang/evalex/data/conversion/DateTimeConverterTest.java
#	src/test/java/com/ezylang/evalex/data/conversion/NumberConverterTest.java
#	src/test/java/com/ezylang/evalex/data/conversion/StringConverterTest.java

Loading branch information

uklimaschewski committed Sep 20, 2023

2 parents 4c5dc41 + 71d1be9 commit 3725c84