socialforge/app
huang 5532ec3b86 Merge branch 'develop' into dev_newproject
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
2016-10-15 10:53:01 +08:00
..
api/mobile 优化下回复相关的微信动态 2016-10-13 09:25:18 +08:00
assets 课程大纲教师团队的管理 2016-09-23 09:22:47 +08:00
controllers Merge branch 'develop' into dev_newproject 2016-10-15 10:53:01 +08:00
helpers Merge branch 'develop' into dev_newproject 2016-10-15 10:53:01 +08:00
models Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
services 班级设置报500 2016-10-08 16:41:06 +08:00
sweepers
tasks
views Merge branch 'develop' into dev_newproject 2016-10-15 10:53:01 +08:00