cxt 6eb518c465 Merge branch 'cxt_course' into develop ... Conflicts: app/helpers/application_helper.rb app/views/at/show.json.erb app/views/layouts/new_base_user.html.erb		2016-08-26 16:23:07 +08:00
..
mobile	Merge branch 'cxt_course' into develop	2016-08-26 16:23:07 +08:00