huang 52ebd5b585 Merge branch 'dev_linda' into develop ... Conflicts: app/views/games/show.html.erb		2017-04-19 16:27:51 +08:00
..
api/mobile	first commit	2017-04-07 10:16:13 +08:00
assets	first commit	2017-04-07 10:16:13 +08:00
controllers	一些改动	2017-04-19 11:31:52 +08:00
helpers	Merge branch 'dev_linda' into develop	2017-04-19 16:27:51 +08:00
models	发布实训接口	2017-04-16 17:20:47 +08:00
services	first commit	2017-04-07 10:16:13 +08:00
sweepers	first commit	2017-04-07 10:16:13 +08:00
tasks	first commit	2017-04-07 10:16:13 +08:00
views	Merge branch 'dev_linda' into develop	2017-04-19 16:27:51 +08:00