Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
* upstream/main:
  Go 1.19 format (go-gitea#20758)
  [skip ci] Updated translations via Crowdin
  • Loading branch information
zjjhot committed Aug 31, 2022
2 parents b2861a8 + a48d6ba commit 9425b13
Show file tree
Hide file tree
Showing 24 changed files with 628 additions and 578 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.3.1
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.0
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.29.0
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.0
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest

DOCKER_IMAGE ?= gitea/gitea
Expand Down
2 changes: 1 addition & 1 deletion assets/emoji.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions build/generate-emoji.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ const hdr = `
package emoji
// Code generated by gen.go. DO NOT EDIT.
// Code generated by build/generate-emoji.go. DO NOT EDIT.
// Sourced from %s
//
var GemojiData = %#v
`
Loading

0 comments on commit 9425b13

Please sign in to comment.