Skip to content
Snippets Groups Projects
Commit 892e6255 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'hotline#126321_player_audio' of git.afi-sa.net:afi/opacce into... 

Merge branch 'hotline#126321_player_audio' of git.afi-sa.net:afi/opacce into hotline#126321_player_audio

# Conflicts:
#	tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
parents 6f7ca573 9c3faab9
Branches
Tags
2 merge requests!3975Hotline,!3974hotline MT #126321 plug audio HTML to album instead of AudioJs
Pipeline #13089 passed with stage
in 48 minutes and 1 second
Hide whitespace changes
Inline Side-by-side
tests/scenarios/Templates/TemplatesDigitalResourcesTest.php
+ 1
− 0
View file @ 892e6255
......@@ -458,6 +458,7 @@ class TemplatesDigitalResourcesAudioRecordTest extends AbstractControllerTestCas
class TemplatesDigitalResourcesTrailerEmptyPlayerAdministrationTest extends AbstractControllerTestCase {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment