cxt 341927506a Merge branch 'cxt_course' into develop ... Conflicts: db/schema.rb		2016-04-29 15:58:05 +08:00
..
controllers	缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息	2016-04-27 10:28:36 +08:00
factories	Merge branch 'cxt_course' into develop	2016-04-29 15:58:05 +08:00
fixtures	头像上传只允许图片	2015-05-15 16:18:44 +08:00
models	Merge branch 'cxt_course' into develop	2016-04-29 15:58:05 +08:00
requests	代码重置	2016-03-11 10:18:10 +08:00
support	代码重置	2016-03-11 10:18:10 +08:00
rails_helper.rb	代码重置	2016-03-11 10:18:10 +08:00
seeds.rb	代码重置	2016-03-11 10:18:10 +08:00
shared_account_spec.rb	代码重置	2016-03-11 10:18:10 +08:00
spec_helper.rb	代码重置	2016-03-11 10:18:10 +08:00