Merge branch 'release'

semi-fullscreen
Frode Petterson 2018-11-22 10:16:37 +01:00
commit c438f9136e
1 changed files with 2 additions and 2 deletions

View File

@ -4362,7 +4362,7 @@ class H5PContentValidator {
(object) array( (object) array(
'type' => 'optgroup', 'type' => 'optgroup',
'label' => $this->h5pF->t('Creative Commons'), 'label' => $this->h5pF->t('Creative Commons'),
'options' => [ 'options' => array(
(object) array( (object) array(
'value' => 'CC BY', 'value' => 'CC BY',
'label' => $this->h5pF->t('Attribution (CC BY)'), 'label' => $this->h5pF->t('Attribution (CC BY)'),
@ -4401,7 +4401,7 @@ class H5PContentValidator {
'value' => 'CC PDM', 'value' => 'CC PDM',
'label' => $this->h5pF->t('Public Domain Mark (PDM)') 'label' => $this->h5pF->t('Public Domain Mark (PDM)')
), ),
] )
), ),
(object) array( (object) array(
'value' => 'GNU GPL', 'value' => 'GNU GPL',