Merge branch 'hotfix/0.1.29' into develop
Merge branch 'master' into develop
translation
PSR
Modification de row
Merge branch 'Axxon-develop' into develop
Revert "Modification de row"

This reverts commit 9384a24efb31f2192d3c1a19433ec4d3a974af51.
Merge branch 'release/0.1.30'