Frode Petterson 9672986112 Merge branch 'settings' into d6 ... Conflicts: h5p.classes.php js/h5p.js		2015-03-20 13:52:57 +01:00
..
h5p-admin.css	Removed IE's special input field clearing.	2014-10-28 10:03:16 +01:00
h5p.css	Merge branch 'settings' into d6	2015-03-20 13:52:57 +01:00