Merge remote-tracking branch 'cxf-fediz/master' into FEDIZ-250
authorAlexey Markevich <buhhunyx@gmail.com>
Thu, 8 Oct 2020 10:48:29 +0000 (13:48 +0300)
committerAlexey Markevich <buhhunyx@gmail.com>
Thu, 8 Oct 2020 10:48:29 +0000 (13:48 +0300)
commit06478a3053e0fee20b63f98a14b6038c955723b8
tree5bf41fe65c4cd47c8ea0b3941f2729807f3f0a10
parent97da721e1c23db507bf0fdfb549ebaa13d489494
parentcc9d860a67df94fbe11dac247bfb507c33b82da3
Merge remote-tracking branch 'cxf-fediz/master' into FEDIZ-250

Conflicts:
pom.xml
pom.xml