5 commits

Author	SHA1	Message	Date
adel.kalimullin	957984b4c7	fix after merge	2025-09-04 13:17:31 +03:00
adel.kalimullin	b2f0e2bf25	Merge remote-tracking branch 'origin/develop' into ERVU-506_addr ... # Conflicts: # map_v1/info_recruits/citizen_tables/citizen/parallel/citizen_flow1.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/citizen_flow2.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/citizen_flow3.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/citizen_flow4.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/citizen_flow5.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/delta_citizen_flow1.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/delta_citizen_flow2.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/delta_citizen_flow3.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/delta_citizen_flow4.hpl # map_v1/info_recruits/citizen_tables/citizen/parallel/delta_citizen_flow5.hpl	2025-09-04 12:39:28 +03:00
adel.kalimullin	a8bc22b44d	Merge develop into ERVU-504_family	2025-09-04 11:43:37 +03:00
adel.kalimullin	c6080b6f4b	Merge remote-tracking branch 'origin/develop' into ERVU-506_addr	2025-08-14 14:45:32 +03:00
r.gaztdinov	246c489b6d	new_citizen	2025-08-12 16:42:25 +03:00