Commit Graph

4 Commits

Author SHA1 Message Date
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
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 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00