Merge branch 'api-1.0'
Conflicts: example_content/boardgame/H5P.Boardgame/library.json example_content/boardgame/H5P.MultiChoice/library.json example_content/boardgame/H5P.QuestionSet/library.json example_content/coursepresentation/H5P.CoursePresentation/library.json example_content/drag-question/H5P.DragQuestion/css/dragquestion.css example_content/interactive-video/H5PEditor.InteractiveVideo/library.jsonpull/1/head
commit
128db363c8
|
@ -3,7 +3,7 @@
|
||||||
"contentType": "question",
|
"contentType": "question",
|
||||||
"majorVersion": 1,
|
"majorVersion": 1,
|
||||||
"minorVersion": 0,
|
"minorVersion": 0,
|
||||||
"patchVersion": 41,
|
"patchVersion": 43,
|
||||||
"runnable": 1,
|
"runnable": 1,
|
||||||
"fullscreen": 0,
|
"fullscreen": 0,
|
||||||
"machineName": "H5P.QuestionSet",
|
"machineName": "H5P.QuestionSet",
|
||||||
|
|
Loading…
Reference in New Issue