alan 972b788687 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh ... Conflicts: public/stylesheets/application.css Signed-off-by: alan <547533434@qq.com>		2014-11-19 17:30:53 +08:00
..
_search_bar.html.erb	#1279 修改搜索提示	2014-08-13 16:55:42 +08:00
index.html.erb	#985 micros版：资源搜索，下载资源控件显示错误	2014-11-17 16:20:48 +08:00
search.html.erb	<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改	2014-11-19 17:25:10 +08:00