jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views/kaminari
History
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 		2015-04-07 13:47:39 +08:00
..
_first_page.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
_gap.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
_last_page.html.erb merge dev_zanle branch 2015-01-31 10:47:09 +08:00
_next_page.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
_page.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
_paginator.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00
_prev_page.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:47:39 +08:00