cxt 139a0597d8 Merge branch 'dev_xucheng' into develop ... Conflicts: app/views/layouts/base_management.html.erb app/views/managements/_class_shixuns_list.html.erb app/views/managements/_users_authorization_list.html.erb app/views/managements/identity_authentication.html.erb app/views/managements/shixun_authorization.html.erb app/views/managements/subject_authorization.html.erb config/routes.rb public/javascripts/edu/account.js public/javascripts/edu/syllabus.js		2017-08-11 15:20:56 +08:00
..
migrate	Merge branch 'dev_xucheng' into develop	2017-08-11 15:20:56 +08:00
development.sqlite3	first commit	2017-04-07 10:16:13 +08:00