Merge branch 'main' of https://github.com/terra-money/core

terra-money · Feb 3, 2022 · f6a968a · f6a968a
2 parents 7e9f650 + 951fee0
commit f6a968a
Show file tree

Hide file tree

Showing 36 changed files with 736 additions and 78 deletions.
diff --git a/Makefile b/Makefile
@@ -232,7 +232,7 @@ proto-lint:
 
 ## TODO - change branch release/v0.5.x to master after columbus-5 merged
 proto-check-breaking:
-	@$(DOCKER_BUF) breaking --against-input $(HTTPS_GIT)#branch=master
+	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=master
 
 .PHONY: proto-all proto-gen proto-swagger-gen proto-format proto-lint proto-check-breaking 
 

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go