Commit Graph

4 Commits

Author SHA1 Message Date
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
2015-04-07 13:47:39 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
Administrator 83ff8a31c1 test 2013-08-22 16:42:13 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00