Frode Petterson 2d95ac1d7a Merge branch 'master' into api-1.2 ... Conflicts: example_content/coursepresentation/H5P.CoursePresentation/library.json example_content/coursepresentation/H5P.Image/library.json example_content/interactive-video/H5P.InteractiveVideo/library.json example_content/interactive-video/H5P.InteractiveVideo/scripts/interactive-video.js		2014-03-21 12:26:58 +01:00
css	HFJ-170: Removed question padding.	2014-02-26 11:02:33 +01:00
fonts	HFJ-1	2013-10-31 13:39:51 +01:00
js	Merge branch 'master' into api-1.2	2014-03-21 12:26:58 +01:00
language	HFJ-1: Changed default score string. Also make score string editable and translatable	2013-11-08 10:25:49 +01:00
library.json	Merge branch 'api-1.0'	2014-03-13 11:00:10 +01:00
semantics.json	HFJ-1: Changed default score string. Also make score string editable and translatable	2013-11-08 10:25:49 +01:00