linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop ... Conflicts: app/controllers/account_controller.rb		2014-06-23 15:06:37 +08:00
..
assets	为竞赛通知添加评论	2014-06-05 10:28:36 +08:00
controllers	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop	2014-06-23 15:06:37 +08:00
helpers	增加、修改作业时提交项目增加空值选择，即不选定任何关联项目	2014-06-20 13:52:17 +08:00
models	处理undefined method `update_user_level' for nil:NilClass问题	2014-06-23 09:27:21 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop	2014-06-23 15:06:37 +08:00