Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync dev with mm2.1 #1236

Merged
merged 5 commits into from
Mar 29, 2022
Merged

Sync dev with mm2.1 #1236

merged 5 commits into from
Mar 29, 2022

Conversation

Milerius
Copy link

No description provided.

ca333 and others added 5 commits January 18, 2022 16:13
@ca333 @smk762
Update readme (#1180)
0c17d17 
* update readme

update intro and add badges

* add badges

* update release page ref

* Update README.md

Restructured, added usage examples, links to docs etc.
Feel like we might need some images, will see if there is something nice to the eyes we can add.
Please advise if anything is missing etc.

* add mention of Awesome AtomicDEX

* remove ref to unofficial makerbot

* remove MM2.jsn fields with default values

Co-authored-by: smk762 <35845239+smk762@users.noreply.github.com>
@tonymorony
removed nxt from help print #1198 (#1199)
24c9187
@Milerius
feat(firo_hot_fix): add support for prog pow #1232 (#1235)
dbacb81 
* feat(firo_hot_fix): add support for prog pow

* feat(firo): cargo clippy

* feat(firo): update ring dependency

* Revert "feat(firo): update ring dependency"

This reverts commit 8db763f.
@Milerius
feat(dev): sync dev with mm2.1
e664f97
@Milerius
feat(message_service): pdate chat id
07cbda7
artemii235
artemii235 approved these changes Mar 29, 2022
View reviewed changes
Copy link
Member

@artemii235 artemii235 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@artemii235 artemii235 merged commit b6da302 into dev Mar 29, 2022
@artemii235 artemii235 deleted the sync_mm21 branch March 29, 2022 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artemii235 artemii235 artemii235 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Milerius @artemii235 @ca333 @tonymorony