Merge remote-tracking branch 'origin/psemenkov' into psemenkov
# Conflicts: # clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/config/IOperator.java
This commit is contained in:
commit
26aed28ba2