cxt a087cc809a Merge branch 'dev_cxt' into develop ... Conflicts: app/views/courses/index.html.erb app/views/courses/index.js.erb app/views/subjects/_subject_list.html.erb app/views/subjects/show.html.erb		2017-09-01 15:06:18 +08:00
..
environments	first commit	2017-04-07 10:16:13 +08:00
initializers	editormd开启HTML标签解析	2017-08-25 11:19:57 +08:00
locales	基本资料增加“昵称”，个人主页显示“昵称”	2017-07-18 14:47:50 +08:00
additional_environment.rb.example	first commit	2017-04-07 10:16:13 +08:00
application.rb	管理员 单位界面	2017-07-13 15:05:10 +08:00
boot.rb	first commit	2017-04-07 10:16:13 +08:00
configuration.yml.example	first commit	2017-04-07 10:16:13 +08:00
configuration.yml.template	first commit	2017-04-07 10:16:13 +08:00
environment.rb	first commit	2017-04-07 10:16:13 +08:00
menu.yml	first commit	2017-04-07 10:16:13 +08:00
menu.yml.production	first commit	2017-04-07 10:16:13 +08:00
menu.yml.test	first commit	2017-04-07 10:16:13 +08:00
preinitializer.rb	first commit	2017-04-07 10:16:13 +08:00
private.key	first commit	2017-04-07 10:16:13 +08:00
query_reviewer.yml	first commit	2017-04-07 10:16:13 +08:00
routes.rb	Merge branch 'dev_cxt' into develop	2017-09-01 15:06:18 +08:00
settings.yml	身份认证	2017-05-04 14:33:50 +08:00
wechat.yml.test	first commit	2017-04-07 10:16:13 +08:00