akulikov 9701877672 Merge branch 'master' into dev ... # Conflicts: # clearing-parent/account-service/pom.xml # clearing-parent/backend-api/pom.xml # clearing-parent/balance-service/pom.xml # clearing-parent/classes/pom.xml # clearing-parent/cleaning-builders/pom.xml # clearing-parent/clearing-service/pom.xml # clearing-parent/clearing-validation/pom.xml # clearing-parent/company-service/pom.xml # clearing-parent/db-scripts/pom.xml # clearing-parent/dbf-exporter/pom.xml # clearing-parent/dbf-importer/pom.xml # clearing-parent/dictionary/pom.xml # clearing-parent/extdb-importer/pom.xml # clearing-parent/gateway-api/pom.xml # clearing-parent/imdg-hist/pom.xml # clearing-parent/imdg/pom.xml # clearing-parent/lim-exporter/pom.xml # clearing-parent/pom.xml # clearing-parent/registry-service/pom.xml # clearing-parent/reports-service/pom.xml # clearing-parent/scheduler-service/pom.xml # clearing-parent/securities-service/pom.xml # clearing-parent/security-util/pom.xml # clearing-parent/swt-exporter/pom.xml # clearing-parent/swt-importer/pom.xml # clearing-parent/test-clearing/pom.xml # clearing-parent/trade-importer/pom.xml # clearing-parent/utility-service/pom.xml # platform-parent/pom.xml # pom.xml # z-distr/pom.xml		2024-09-09 12:38:40 +03:00
..
src/main	xml-importer and xml-exporter added to z-distr	2024-08-08 11:51:29 +03:00
pom.xml	up pom version	2024-09-09 12:03:12 +03:00