taglist的排序
version and deloauth
Merge remote-tracking branch 'lingqiao/2.5x' into dev
修改css以及代码中的小bug
Merge remote-tracking branch 'wushijing/dev' into dev
Merge remote-tracking branch 'team/dev' into kue
gotosetup页面的css修改
修改grunt.js
Merge remote-tracking branch 'liuxiaodong/kue' into dev
Merge remote-tracking branch 'heting/2.5x' into dev
modify snsshare and setname
Merge remote-tracking branch 'qiao/2.5x' into 2.5x
share emailadd
Merge remote-tracking branch 'lingqiao/2.5x' into dev
fix #805
Merge remote-tracking branch 'heting/2.5x' into dev
点击设置用户名按钮但未设置用户名后页面显示问题
解决冲突
error process
Merge remote-tracking branch 'team/dev' into 2.5x