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.

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

chore: Merge master to dev. #866

Merged
merged 3 commits into from
Sep 28, 2023
Merged

chore: Merge master to dev. #866

merged 3 commits into from
Sep 28, 2023

Conversation

stoobie
Copy link
Collaborator

@stoobie stoobie commented Sep 28, 2023

Description of the Changes

Resolving conflicts between Master and Dev.

PR Preview URL

After you push a commit to this PR, a preview is built and a URL to the root of the preview appears in the comment feed.

Paste here the specific URL(s) of the content that this PR addresses.

Check List

  • Changes have been done against dev branch, and PR does not conflict
  • PR title follows the convention: <docs/feat/fix/chore>(optional scope): <description>, e.g: fix: minor typos in code

This change is Reviewable

JameStark and others added 3 commits September 27, 2023 12:24
* Update token-bridge.adoc (#859)

Minor edits, clarification and grammar.

* doc_guidelines.adoc: Added section on guidelines for getting peer review. (#862)

* Fix typo in Update doc_guidelines.adoc

* Fix: Some clarifications and minor edits. (#835)

* Some clarifications and minor edits.

* Apply suggestions from code review

Minor edits or typo fixes.

---------

Co-authored-by: JameStark <[email protected]>

* Update index.adoc

---------

Co-authored-by: Steve Goodman <[email protected]>
@stoobie stoobie merged commit 4edc333 into dev Sep 28, 2023
@github-actions
Copy link

Your preview build is ready! ✨ Check the following link in 1-2 minutes: https://starknet-io.github.io/starknet-docs/pr-866/documentation/ .

stoobie added a commit that referenced this pull request Sep 28, 2023
* Correct typo and merge latest reviews (#863)

* Update token-bridge.adoc (#859)

Minor edits, clarification and grammar.

* doc_guidelines.adoc: Added section on guidelines for getting peer review. (#862)

* Fix typo in Update doc_guidelines.adoc

* Fix: Some clarifications and minor edits. (#835)

* Some clarifications and minor edits.

* Apply suggestions from code review

Minor edits or typo fixes.

---------



* Update index.adoc

---------



* chore(release): 0.1.327

---------


Co-authored-by: Starknet docs deployer <>

Co-authored-by: JameStark <[email protected]>
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.

2 participants