M1kola fd372b47ae Merge remote-tracking branch 'origin/parthners-area-fix-modal' into parthners-area ... # Conflicts: # src/pages/PartnerSettings/PartnerSettings.js		2023-03-23 16:47:15 +03:00
..
PartnerSettings.js	partner employees	2023-03-23 14:00:34 +03:00
partnerSettings.scss	partner employees	2023-03-23 16:18:57 +03:00