Merge branch 'master' into dependabot/go_modules/github.com/cosmos/co…

…smos-sdk/errors-1.0.0-beta.4
cosmos · Mar 30, 2022 · cf55a9c · cf55a9c
2 parents ee6e6bc + 90f6187
commit cf55a9c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -18,6 +18,8 @@
   - x/genutil/**/*
 "C:x/gov":
   - x/gov/**/*
+"C:x/group":
+  - x/group/**/*
 "C:x/mint":
   - x/mint/**/*
 "C:x/nft":

diff --git a/.mergify.yml b/.mergify.yml
@@ -14,8 +14,16 @@ pull_request_rules:
         name: default
         method: squash
         commit_message_template: |
-           {{ title }} (#{{ number }})
-           {{ body }}
+          {{ title }} (#{{ number }})
+          {{ body }}
+  - name: backport patches to v0.46.x branch
+    conditions:
+      - base=master
+      - label=backport/0.46.x
+    actions:
+      backport:
+        branches:
+          - release/v0.46.x
   - name: backport patches to v0.45.x branch
     conditions:
       - base=master

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ For more information, see the [Cosmos SDK Documentation](./docs/).
 
 ## Contributing
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for details how to contribute and participate in our [dev calls](./CONTRIBUTE.md#dev-calls).
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for details how to contribute and participate in our [dev calls](./CONTRIBUTING.md#teams-dev-calls).
 If you want to follow the updates or learn more about the latest design then join our [Discord](https://discord.com/invite/cosmosnetwork).
 
 ## Tools and Frameworks

diff --git a/docs/intro/sdk-app-architecture.md b/docs/intro/sdk-app-architecture.md
@@ -60,7 +60,7 @@ The Tendermint [consensus algorithm](https://docs.tendermint.com/v0.34/introduct
 
 ## ABCI
 
-Tendermint passes transactions to the application through an interface called the [ABCI](https://docs.tendermint.com/v0.34/spec/abci/), which the application must implement.
+Tendermint passes transactions to the application through an interface called the [ABCI](https://docs.tendermint.com/master/spec/abci/), which the application must implement.
 
 ```text
               +---------------------+
-Original file line number
+Diff line change
@@ Expand Up @@
     ## ABCI
-    Tendermint passes transactions to the application through an interface called the [ABCI](https://docs.tendermint.com/v0.34/spec/abci/), which the application must implement.
+    Tendermint passes transactions to the application through an interface called the [ABCI](https://docs.tendermint.com/master/spec/abci/), which the application must implement.
     ```text
                   +---------------------+
@@ Expand Down @@