Commit 9e51dc40 authored by Andrew Nicols's avatar Andrew Nicols Committed by jun
Browse files

Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle

parents ebe2fafa 8c42eef3
...@@ -2111,7 +2111,7 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0, ...@@ -2111,7 +2111,7 @@ function make_timestamp($year, $month=1, $day=1, $hour=0, $minute=0, $second=0,
* Format a date/time (seconds) as weeks, days, hours etc as needed * Format a date/time (seconds) as weeks, days, hours etc as needed
* *
* Given an amount of time in seconds, returns string * Given an amount of time in seconds, returns string
* formatted nicely as weeks, days, hours etc as needed * formatted nicely as years, days, hours etc as needed
* *
* @package core * @package core
* @category time * @category time
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment