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.

nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop ... Conflicts: app/views/layouts/_base_footer.html.erb		11 years ago
..
assets	Merge branch 'szzh' into CourseModify	11 years ago
controllers	Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop	11 years ago
helpers	1.用户申请加入项目向管理员发送邮件	11 years ago
models	1.用户申请加入项目向管理员发送邮件	11 years ago
sweepers	first commit	12 years ago
views	Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop	11 years ago