xianbo 21ffbe637e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop ... Conflicts: app/views/projects/_project.html.erb app/views/projects/member.html.erb app/views/users/index.html.erb config/locales/zh.yml db/schema.rb files/2013/10/131007102834__my_course.html.erb		2013-10-24 08:33:07 +08:00
..
assets	new version	2013-09-12 10:41:15 +08:00
controllers	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-10-24 08:33:07 +08:00
helpers	add the project what one watch	2013-10-24 08:24:56 +08:00
models	add the project what one watch	2013-10-24 08:24:56 +08:00
sweepers	first commit	2013-08-01 10:33:49 +08:00
views	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-10-24 08:33:07 +08:00