psemenkov 1adfb2f7a7 Merge remote-tracking branch 'origin/dev' into imdg_refactoring ... # Conflicts: # clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/statement/Statement.java # clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/UserConnect.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/IMDGApplication.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RelationMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/StatementMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java # clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java		2022-10-11 12:28:55 +03:00
..
src/main	Merge remote-tracking branch 'origin/dev' into imdg_refactoring	2022-10-11 12:28:55 +03:00
pom.xml	добавил автодобавление пользователя и методы в Imdg	2022-09-07 20:36:11 +03:00