ok
Merge remote-tracking branch 'origin/master'
решение проблемы с EDI
Merge remote-tracking branch 'origin/master'