]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Merge branch 'hotfix/1.7.1' of github.com:timrwood/moment into hotfix/1.7.1
authorTim Wood <washwithcare@gmail.com>
Wed, 5 Sep 2012 16:12:12 +0000 (09:12 -0700)
committerTim Wood <washwithcare@gmail.com>
Wed, 5 Sep 2012 16:12:12 +0000 (09:12 -0700)
* 'hotfix/1.7.1' of github.com:timrwood/moment:
  remove trailing comma from ru.js, fixes #424
  putting '} else {' on the same line
  Support for Chuvash suffix changes in future fromNow
  Estonian i18n

1  2 
moment.js

diff --cc moment.js
Simple merge