Merge branch 'master' into release

ramdomize
thomasmars 2016-09-12 10:56:44 +02:00
commit 668796dddb
2 changed files with 8 additions and 8 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": 8, "minorVersion": 9,
"patchVersion": 4, "patchVersion": 0,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],
@ -41,7 +41,7 @@
{ {
"machineName": "H5P.Video", "machineName": "H5P.Video",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 2 "minorVersion": 3
}, },
{ {
"machineName": "H5P.JoubelUI", "machineName": "H5P.JoubelUI",
@ -61,4 +61,4 @@
"minorVersion": 1 "minorVersion": 1
} }
] ]
} }

View File

@ -110,9 +110,9 @@
"label": "Question type", "label": "Question type",
"description": "Library for this question.", "description": "Library for this question.",
"options": [ "options": [
"H5P.MultiChoice 1.7", "H5P.MultiChoice 1.8",
"H5P.DragQuestion 1.6", "H5P.DragQuestion 1.7",
"H5P.Blanks 1.6", "H5P.Blanks 1.7",
"H5P.MarkTheWords 1.6", "H5P.MarkTheWords 1.6",
"H5P.DragText 1.5" "H5P.DragText 1.5"
] ]
@ -385,4 +385,4 @@
} }
] ]
} }
] ]