Commit df30856c authored by Emmanuel Promayon's avatar Emmanuel Promayon

Merge branch 'promayoe-master-patch-44539' into 'master'

NEW add doc to solve conflict with develop

See merge request !4
parents 5dffe143 b34e95c6
Pipeline #35859 passed with stages
in 38 seconds