psemenkov d45878e1a2 Merge remote-tracking branch 'origin/dev' into CLS-268 ... # Conflicts: # clearing-parent/backend-api/src/main/resources/meta/data.xml # clearing-parent/backend-api/src/main/resources/meta/meta.xml # clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java # clearing-parent/backend-api/src/test/resources/meta.json # clearing-parent/db-scripts/src/main/resources/db/DATA.sql # clearing-parent/db-scripts/src/main/resources/db/DDL.sql		2023-04-26 11:42:16 +03:00
..
main	Merge remote-tracking branch 'origin/dev' into CLS-268	2023-04-26 11:42:16 +03:00
test	backend-api http://jira.mfd.msk:8088/browse/CLS-273	2023-04-20 18:48:47 +03:00