Merge branch 'api-1.1' into api-1.2

pull/1/head
Frode Petterson 2014-04-11 15:51:29 +02:00
commit dc2da8b757
2 changed files with 8 additions and 3 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*~

View File

@ -3,7 +3,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 0, "minorVersion": 0,
"patchVersion": 45, "patchVersion": 46,
"runnable": 1, "runnable": 1,
"fullscreen": 0, "fullscreen": 0,
"machineName": "H5P.QuestionSet", "machineName": "H5P.QuestionSet",
@ -14,10 +14,14 @@
}, },
"license": "cc-by-sa", "license": "cc-by-sa",
"preloadedJs": [ "preloadedJs": [
{"path": "js/questionset.js"} {
"path": "js/questionset.js"
}
], ],
"preloadedCss": [ "preloadedCss": [
{"path": "css/questionset.css"} {
"path": "css/questionset.css"
}
], ],
"preloadedDependencies": [ "preloadedDependencies": [
{ {