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

feat: Reverting unwanted/tested changes from upstream #186

Merged
merged 4 commits into from
Apr 26, 2024

Conversation

billyvg
Copy link
Member

@billyvg billyvg commented Apr 26, 2024

@billyvg billyvg merged commit 9e7381d into develop Apr 26, 2024
11 checks passed
@billyvg billyvg deleted the feat-revert-unwanted-untested-changes branch April 26, 2024 17:05
billyvg added a commit that referenced this pull request Apr 30, 2024
This brings our fork up to date with the latest upstream changes except
the reverted commits in #186.

`develop` branch will represent the rrweb changes that we want to use,
`master` tracks upstream master, and `sentry-v2` is contains our forked
changes on top of `develop`.
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.

None yet

1 participant