Merge branch 'master' into fork-and-pullreq

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala
This commit is contained in:
takezoe
2013-07-12 15:50:53 +09:00
41 changed files with 488 additions and 258 deletions

View File

@@ -345,6 +345,10 @@ div.commit-avatar-image {
margin-right: 4px;
}
div.commit-message-box {
margin-left: 42px;
}
pre.commit-description {
font-weight: normal;
border: none;