Skip to content

[docs] resolve changelog conflict#1707

Merged
shamardy merged 4 commits intodevfrom
resolve_conflict_changelog
Mar 15, 2023
Merged

[docs] resolve changelog conflict#1707
shamardy merged 4 commits intodevfrom
resolve_conflict_changelog

Conversation

@ca333
Copy link
Copy Markdown

@ca333 ca333 commented Mar 10, 2023

No description provided.

ca333 and others added 4 commits March 6, 2023 19:56
* change release branch from mm2.1 to main

* replace mm2.1 to main in eth_tests

* ci: disable mac ci steps (#1701)

Reviewed-by: ozkanonur <work@onurozkan.dev>
* propose change.log

add a chronological "living" changelog file as a index for the dev.logs

* introduce CHANGELOG.md

* [docs] update changelog

* [docs] add changelog date/tag

* update changelog

* update date

* re-enable mac ci, add one more change log

---------

Co-authored-by: shamardy <shamardy@yahoo.com>
Reviewed-by: ozkanonur <work@onurozkan.dev>
@ca333 ca333 changed the base branch from main to dev March 15, 2023 19:08
@ca333 ca333 marked this pull request as ready for review March 15, 2023 19:09
@ca333 ca333 changed the title [release] 1.0.1-beta [docs] resolve changelog conflict Mar 15, 2023
@ca333 ca333 requested review from onur-ozkan and shamardy March 15, 2023 19:10
@ca333 ca333 mentioned this pull request Mar 15, 2023
@shamardy shamardy merged commit be5503f into dev Mar 15, 2023
@shamardy shamardy deleted the resolve_conflict_changelog branch March 15, 2023 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants