Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12522] Add function parameter description in guesser interface
This commit is contained in:
Joas Schilling 2014-05-11 10:10:37 +02:00
commit a54fc18620

View file

@ -26,6 +26,7 @@ interface guesser_interface
* Guess mimetype of supplied file * Guess mimetype of supplied file
* *
* @param string $file Path to file * @param string $file Path to file
* @param string $file_name The real file name
* *
* @return string Guess for mimetype of file * @return string Guess for mimetype of file
*/ */