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
..
apis	app接口部分信息国际化	2015-03-19 14:41:31 +08:00
entities	修改课程动态接口	2015-03-18 17:21:19 +08:00
middleware	加上作业	2015-01-04 14:55:45 +08:00
api.rb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-04-07 13:47:39 +08:00