Merge branch 'stable'

pull/3/head
Frode Petterson 2016-01-21 14:35:06 +01:00
commit bf0dd46cc9
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 6, "minorVersion": 6,
"patchVersion": 0, "patchVersion": 2,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],

View File

@ -113,7 +113,7 @@
"H5P.MultiChoice 1.5", "H5P.MultiChoice 1.5",
"H5P.DragQuestion 1.5", "H5P.DragQuestion 1.5",
"H5P.Blanks 1.4", "H5P.Blanks 1.4",
"H5P.MarkTheWords 1.4", "H5P.MarkTheWords 1.5",
"H5P.DragText 1.4" "H5P.DragText 1.4"
] ]
} }