Merge branch 'master' into pr-support-textmsg-in-email
commit 2e9155fbccff0ab2d9450f9e56ce7a364d55e255
2 parents ef67c94 + f33a30c
@Naoki Takezoe Naoki Takezoe authored on 18 Aug 2017
GitHub committed on 18 Aug 2017
Showing 5 changed files
View
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
View
src/main/scala/gitbucket/core/service/SystemSettingsService.scala
View
src/main/twirl/gitbucket/core/admin/system.scala.html
View
src/main/twirl/gitbucket/core/main.scala.html
View
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala