Linda 72f085e13e Merge branch 'develop' into dev_raining ... Conflicts: db/migrate/20170219062646_add_positon_to_training_task.rb db/schema.rb		2017-02-20 10:15:47 +08:00
..
migrate	Merge branch 'develop' into dev_raining	2017-02-20 10:15:47 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	实训项目相关模块相关api的开发	2017-02-19 17:49:58 +08:00