xianbo c7b38e5bf2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/news/index.html.erb		2013-11-01 15:53:38 +08:00
..
_form.html.erb	课程合并	2013-09-23 08:44:48 +08:00
_news.html.erb	用户项目图片更新	2013-08-07 11:29:00 +08:00
edit.html.erb	first commit	2013-08-01 10:33:49 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-11-01 15:53:38 +08:00
new.html.erb	first commit	2013-08-01 10:33:49 +08:00
show.html.erb	新闻界面添加删除功能	2013-11-01 10:01:16 +08:00