Merge branch 'api-1.0'

Conflicts:
	example_content/boardgame/H5P.Boardgame/library.json
	example_content/boardgame/H5P.MultiChoice/library.json
	example_content/boardgame/H5P.QuestionSet/library.json
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/drag-question/H5P.DragQuestion/css/dragquestion.css
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
pull/1/head
Frode Petterson 2014-03-13 11:00:10 +01:00
commit 128db363c8
1 changed files with 1 additions and 1 deletions

View File

@ -3,7 +3,7 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 0,
"patchVersion": 41,
"patchVersion": 43,
"runnable": 1,
"fullscreen": 0,
"machineName": "H5P.QuestionSet",