Frode Petterson 21674d31ac Merge branch 'master' into settings ... Conflicts: js/h5p.js		2015-02-04 09:32:03 +01:00
..
h5p-admin.css	Removed IE's special input field clearing.	2014-10-28 10:03:16 +01:00
h5p.css	Merge branch 'master' into settings	2015-02-04 09:32:03 +01:00