Before merge Marine
Merge branch 'master' of https://github.com/Gregory14/impala
Merge branch 'master' of https://github.com/Gregory14/impala
Before Merge Marine
Before Merge Marine
Video.js + modif waiting
Video.js + modif waiting
Merge branch 'master' of https://github.com/Gregory14/impala

Conflicts:
	impala-web/.sass-cache/4dc2ca9346b1a661ffd81b908131ffb1620e272a/screen.scssc