Browse Source

Merge branch 'master' into develop

css_transitions
josdejong 11 years ago
parent
commit
44200655de
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      src/util.js

+ 1
- 1
src/util.js View File

@ -171,7 +171,7 @@ util.convert = function convert(object, type) {
return moment(object.valueOf());
}
else if (moment.isMoment(object)) {
return moment.clone();
return moment(object);
}
if (util.isString(object)) {
match = ASPDateRegex.exec(object);

Loading…
Cancel
Save