diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-08-31 23:38:13 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-08-31 23:38:13 +0300 |
| commit | f5006d27e43754f571c01ddb3974046d7b8a25bb (patch) | |
| tree | fed5dcf421c58e693f48e6ef463a16d8085185fd /public | |
| parent | a7fd91a0cacc3e5e57585304fb40b02658c98ec6 (diff) | |
| parent | dde56a783752a08561b19cf3b7d0f53635801002 (diff) | |
Merge branch 'pretty-time-refactor' into 'master'
Add support for custom daysPerWeek and hoursPerDay to prettyTime.parseSeconds
Closes gitlab-ee#3298
See merge request !13966
Diffstat (limited to 'public')
0 files changed, 0 insertions, 0 deletions