Merge branch 'master' of b.amendor.com:h5p

pull/1/head
Frode Petterson 2013-07-08 14:30:12 +02:00
commit 6a5acf1c7c
2 changed files with 8 additions and 15 deletions

View File

@ -3,7 +3,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 0, "minorVersion": 0,
"patchVersion": 19, "patchVersion": 20,
"runnable": 1, "runnable": 1,
"machineName": "H5P.QuestionSet", "machineName": "H5P.QuestionSet",
"author": "Amendor AS", "author": "Amendor AS",

View File

@ -42,11 +42,6 @@
"entity": "question", "entity": "question",
"field": { "field": {
"name": "question", "name": "question",
"type": "group",
"label": "Question",
"fields": [
{
"name": "library",
"type": "library", "type": "library",
"label": "Question type", "label": "Question type",
"description": "Library for this question.", "description": "Library for this question.",
@ -56,8 +51,6 @@
"H5P.Blanks 1.0" "H5P.Blanks 1.0"
] ]
} }
]
}
}, },
{ {
"name": "introPage", "name": "introPage",