]> git.ipfire.org Git - thirdparty/moment.git/commit
Merge branch 'develop' of github.com:zenozeng/moment into zenozeng-develop
authorIskren Chernev <iskren.chernev@gmail.com>
Sun, 13 Oct 2013 08:48:39 +0000 (01:48 -0700)
committerIskren Chernev <iskren.chernev@gmail.com>
Sun, 13 Oct 2013 08:48:39 +0000 (01:48 -0700)
commit479b650557d8a5ce2ac64ccfec0df5bd2f5e098b
tree08e8f607f95817d380a61acf70b9ed2200cfe083
parent6b179d2ed6add7d19d3e8b06d5b34c92e83fc257
parentea2ab37e19f469af3de990cce979f16fc37c318a
Merge branch 'develop' of github.com:zenozeng/moment into zenozeng-develop

Conflicts:
lang/zh-cn.js
lang/zh-cn.js
test/lang/zh-cn.js