]> git.ipfire.org Git - thirdparty/moment.git/commit
Merge branch 'accept-iso-duration-take2' into develop
authorIskren Chernev <iskren.chernev@gmail.com>
Wed, 2 Oct 2013 07:22:39 +0000 (00:22 -0700)
committerIskren Chernev <iskren.chernev@gmail.com>
Wed, 2 Oct 2013 07:22:39 +0000 (00:22 -0700)
commit48c742c19c962f01f27c7aa74223a491413204cd
tree9d6fd85d7a1b09baae4f8540566bf7a29059549a
parentee0f1a3d0733dcd6f15fb7c481d8c5c9272c5960
parenta061fb988015300aebb4cdfb12c704af357d16eb
Merge branch 'accept-iso-duration-take2' into develop

Conflicts:
moment.js
moment.js
test/moment/duration.js