daiao e86bd6728e Merge branch 'cxt_course' into develop ... Conflicts: app/controllers/users_controller.rb app/helpers/application_helper.rb app/views/users/_user_activities.html.erb db/schema.rb		2016-12-24 16:48:48 +08:00
..
migrate	Merge branch 'cxt_course' into develop	2016-12-24 16:48:48 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	竞赛通知 index方法	2016-12-23 17:00:11 +08:00