daiao ec22bbe0c1 Merge branch 'develop' into dev_daiao ... Conflicts: app/controllers/games_controller.rb app/views/challenges/edit.html.erb app/views/games/_game_show.html.erb public/stylesheets/css/edu-common.css		2017-09-15 09:10:36 +08:00
..
migrate	Merge branch 'develop' into dev_daiao	2017-09-15 09:10:36 +08:00
development.sqlite3	first commit	2017-04-07 10:16:13 +08:00