Skip to content

Develop v4 update #816

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
Merged
merged 1 commit into from
May 3, 2023
Merged

Develop v4 update #816

merged 1 commit into from
May 3, 2023

Conversation

JeneaVranceanu
Copy link
Collaborator

Summary of Changes

Branch develop-4.0 was outdated. This PR brings it up to date with develop.

By submitting this pull request, you are confirming the following:
  • I have reviewed the Contribution Guidelines.
  • I have performed a self-review of my own code.
  • I have updated my repository to match the develop branch.
  • I have included test data or screenshots that prove my fix is effective or that my feature works.
  • I have checked that all tests work and swiftlint is not throwing any errors/warnings.

@JeneaVranceanu JeneaVranceanu self-assigned this May 2, 2023
@JeneaVranceanu JeneaVranceanu changed the base branch from develop to develop-4.0 May 2, 2023 08:16
@JeneaVranceanu
Copy link
Collaborator Author

JeneaVranceanu commented May 2, 2023 •
edited
Loading

@yaroslavyaroslav @janndriessen This PR contains conflict fixes that are occurring in #815.

Screenshot 2023-05-02 at 11 18 25

Basically, I merged develop into develop-4.0. No other changes are present in the PR.

@JeneaVranceanu JeneaVranceanu merged commit f0905c2 into web3swift-team:develop-4.0 May 3, 2023
@JeneaVranceanu JeneaVranceanu deleted the develop-v4-update branch May 3, 2023 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janndriessen janndriessen janndriessen approved these changes

@yaroslavyaroslav yaroslavyaroslav yaroslavyaroslav approved these changes

Assignees

@JeneaVranceanu JeneaVranceanu

Labels
4.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JeneaVranceanu @janndriessen @yaroslavyaroslav