-
Ghislain Loas authored
Merge branch 'hotline#126321_player_audio' of git.afi-sa.net:afi/opacce into hotline#126321_player_audio # Conflicts: # tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
892e6255
Merge branch 'hotline#126321_player_audio' of git.afi-sa.net:afi/opacce into hotline#126321_player_audio # Conflicts: # tests/scenarios/Templates/TemplatesDigitalResourcesTest.php