Commit 372126c8 authored by danielkisov's avatar danielkisov
Browse files

Merge remote-tracking branch 'origin/ba_kisov' into ba_kisov

# Conflicts:
#	pom.xml
parents a27fca36 e9218b2d
Pipeline #464996 failed with stage
in 2 minutes and 41 seconds
Markdown is supported
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