Merge branch 'emoji-support' of https://github.com/rlazoti/gitbucket into rlazoti-emoji-support

# Conflicts:
#	src/main/scala/view/Markdown.scala
This commit is contained in:
Naoki Takezoe
2016-07-05 17:21:10 +09:00
876 changed files with 918 additions and 3 deletions

View File

@@ -1941,3 +1941,8 @@ div.container.blame-container{
display: none;
}
}
.emoji {
width: 20px;
height: 20px;
}