Merge branch 'master' into release

pull/4/head
Frode Petterson 2016-03-21 10:01:34 +01:00
commit 4ba08f6a54
2 changed files with 4 additions and 4 deletions

View File

@ -3,8 +3,8 @@
"description": "Put together a set of different questions that has to be solved. (Quiz)", "description": "Put together a set of different questions that has to be solved. (Quiz)",
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 6, "minorVersion": 7,
"patchVersion": 4, "patchVersion": 0,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],
@ -41,7 +41,7 @@
{ {
"machineName": "H5P.Video", "machineName": "H5P.Video",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 1 "minorVersion": 2
}, },
{ {
"machineName": "H5P.JoubelUI", "machineName": "H5P.JoubelUI",

View File

@ -110,7 +110,7 @@
"label": "Question type", "label": "Question type",
"description": "Library for this question.", "description": "Library for this question.",
"options": [ "options": [
"H5P.MultiChoice 1.5", "H5P.MultiChoice 1.6",
"H5P.DragQuestion 1.5", "H5P.DragQuestion 1.5",
"H5P.Blanks 1.4", "H5P.Blanks 1.4",
"H5P.MarkTheWords 1.5", "H5P.MarkTheWords 1.5",