Merge remote-tracking branch 'origin/main' into rc/1.0.0 · reportportal/commons-reporting@55c37a3 · GitHub

Commit

Merge remote-tracking branch 'origin/main' into rc/1.0.0

Browse files

# Conflicts:
#	src/main/java/com/epam/ta/reportportal/ws/reporting/LaunchResource.java
#	src/main/java/com/epam/ta/reportportal/ws/reporting/RetentionPolicy.java
#	src/main/java/com/epam/ta/reportportal/ws/reporting/databind/MultiFormatDateDeserializer.java
#	src/test/java/com/epam/ta/reportportal/ws/reporting/deserializers/MultiFormatDateDeserializerTest.java

Loading branch information

APiankouski committed Aug 30, 2024

2 parents cd91f2f + b5769dc commit 55c37a3