You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

baiyu b26fec0749 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: config/locales/zh.yml		12 years ago
..
assets	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	12 years ago
controllers	添加项目反馈中的回复功能	12 years ago
helpers	问题中留言按钮改为文字	12 years ago
models	添加留言删除前身份确认，修改活动列表中问题部分的显示，添加了项目信息	12 years ago
sweepers	first commit	12 years ago
views	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	12 years ago