yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 ... Conflicts: db/schema.rb public/stylesheets/project.css		2016-04-27 14:30:28 +08:00
..
controllers	代码重置	2016-03-11 10:18:10 +08:00
factories	Merge branch 'hjq_beidou' into yuanke_1	2016-04-27 14:30:28 +08:00
fixtures	头像上传只允许图片	2015-05-15 16:18:44 +08:00
models	Merge branch 'hjq_beidou' into yuanke_1	2016-04-27 14:30:28 +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