yuanke dfd381fc99 Merge branch 'yuanke_org' into develop ... Conflicts: db/schema.rb		2016-07-01 09:31:19 +08:00
..
migrate	Merge branch 'yuanke_org' into develop	2016-07-01 09:31:19 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮	2016-06-30 16:08:36 +08:00