huang 847cae6d41 Merge branch 'develop' into rep_quality ... Conflicts: app/models/applied_message.rb db/schema.rb		2016-07-29 21:39:00 +08:00
..
migrate	Merge branch 'develop' into rep_quality	2016-07-29 21:39:00 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	消息表添加字段	2016-07-29 20:50:55 +08:00