Merge remote-tracking branch 'upstream/master' into pr-new-hooks

kounoike · kounoike · commit f632bbd56dff · 2018-05-29T02:20:38.000+09:00
# Conflicts:
#	build.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.2.0")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.2.0")`
	`1`	`+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.3.0")`