Skip to content

Commit 9425b13

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Go 1.19 format (go-gitea#20758) [skip ci] Updated translations via Crowdin
2 parents b2861a8 + a48d6ba commit 9425b13

File tree

24 files changed

+628
-578
lines changed

24 files changed

+628
-578
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.3.1
3232
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.0
3333
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
3434
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
35-
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.29.0
35+
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.0
3636
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
3737

3838
DOCKER_IMAGE ?= gitea/gitea

assets/emoji.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

build/generate-emoji.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ const hdr = `
214214
215215
package emoji
216216
217-
// Code generated by gen.go. DO NOT EDIT.
217+
// Code generated by build/generate-emoji.go. DO NOT EDIT.
218218
// Sourced from %s
219-
//
220219
var GemojiData = %#v
221220
`

0 commit comments

Comments
 (0)