Fork: 0
johnpearcey / gitbucket_jkp
Browse code
Merge branch '401-news-feed-of-private-repo' of https://github.com/utensil/gitbucket into utensil-401-news-feed-of-private-repo
Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/ActivityService.scala
master
commit 7a44a4d726d27bf145309df7825e52ed989e80f2
2 parents 9dbc0c3 + 3683a5f
@Naoki Takezoe Naoki Takezoe authored on 13 Jul 2014
Patch
Unified Split
Showing 2 changed files
View
src/main/scala/app/IndexController.scala
View
src/main/scala/service/ActivityService.scala