Skip to content
Snippets Groups Projects
Commit 405c54e3 authored by David Diederich's avatar David Diederich
Browse files

Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1 

Conflicts:
	NOTICE
	indexer-core/pom.xml
	pom.xml
parents 0771b51d 970c6dba
No related branches found
No related tags found
2 merge requests!346Merge branch 'aws-integration' into 'master',!270Upgrade Log4J version
Hide whitespace changes
Inline Side-by-side
Showing
with 227 additions and 42 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment