Merge branch 'master' into event-logging

Conflicts:
	h5p.classes.php
pull/17/head
Frode Petterson 2016-03-10 14:21:04 +01:00
commit 61ae8899cb
1 changed files with 0 additions and 10 deletions

View File

@ -334,16 +334,6 @@ interface H5PFrameworkInterface {
*/
public function getLibraryUsage($libraryId);
/**
* Get a key value list of library version and count of content created
* using that library.
*
* @return array
* Array containing library, major and minor version - content count
* e.g. "H5P.CoursePresentation 1.6" => "14"
*/
public function getLibraryContentCount();
/**
* Loads a library
*