Skip to content

Commit

Permalink
5.0.7 conflict (#1009)
Browse files Browse the repository at this point in the history
* Rc0/v5.0.3 (#929)

* chore: version bump SDK (#924)

* chore: update sdk release (#928)

* chore: update sdk release

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* chore: update changelog

Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

* Rc0/v5.0.5 (#934)

* cherrypick commits for v5.0.5

* chore: update changelog

* Rc0/v5.0.6 (#970)

* chore: fix conflicts from stalled release of tendermint v0.34.12

* chore: update changelog

* Rc0/v5.0.7 (#1004)

* gaia: bump SDK (#1002)

* gaia: bump SDK

* chore: fix go sum

* chore: changelog

* fix second conflict

* bring back changes

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko Baricevic <[email protected]>
  • Loading branch information
5 people authored Oct 5, 2021
1 parent 79b8867 commit f6f354d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

## [5.0.7] - 2021-09-30

* (gaia) Bump Cosmos SDK to 0.42.10

## [5.0.6] - 2021-09-16

Expand Down Expand Up @@ -365,7 +368,8 @@ See the [Tendermint v0.34.7 SDK changelog](https://github.com/tendermint/tenderm

<!-- Release links -->

[Unreleased]: https://github.com/cosmos/gaia/compare/v5.0.6...HEAD
[Unreleased]: https://github.com/cosmos/gaia/compare/v5.0.7...HEAD
[v5.0.7]: https://github.com/cosmos/gaia/releases/tag/v5.0.7
[v5.0.6]: https://github.com/cosmos/gaia/releases/tag/v5.0.6
[v5.0.5]: https://github.com/cosmos/gaia/releases/tag/v5.0.5
[v5.0.4]: https://github.com/cosmos/gaia/releases/tag/v5.0.4
Expand Down

0 comments on commit f6f354d

Please sign in to comment.