modify .gitignore
WEB-2748 [6.x] Error message is confusing in the generic error pop up
Merge branch '6.0.x' of github.com:bonitasoft/bonita-web into 6.0.x