Commit 4ef33e00 authored by Steve Azzopardi's avatar Steve Azzopardi

Merge branch 'ce-to-ee-2018-11-26' into 'master'

CE upstream - 2018-11-26 05:21 UTC

See merge request gitlab-org/gitlab-ee!8581
parents 425a37b4 50230815
......@@ -63,14 +63,13 @@ To remove all the time spent at once, use `/remove_time_spent`.
## Configuration
The following time units are available:
* months (mo)
* weeks (w)
* days (d)
* hours (h)
* minutes (m)
Default conversion rates are
* 1 week = 5 days,
* 1 day = 8 hours.
Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
Other interesting links:
......
Markdown is supported
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