Commit 2759a318 authored by Chaillet Maxime's avatar Chaillet Maxime
Browse files

Fix merge conflicts. run grunt dev and grunt.

parents 9804b28b e695453e
Pipeline #5904 failed with stages