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

Bring main to dev #2

Open
wants to merge 30 commits into
base: dev
Choose a base branch
from
Open

Bring main to dev #2

wants to merge 30 commits into from

Conversation

almereyda
Copy link
Contributor

@almereyda almereyda commented Feb 8, 2023

There is drift between dev and main, which is eased by this PR series. Also see

jaensen and others added 30 commits February 11, 2022 19:55
# Conflicts:
#	CirclesLand.BlockchainIndexer.Api/CirclesLand.BlockchainIndexer.Api.csproj
#	CirclesLand.BlockchainIndexer.Server/Startup.cs
#	CirclesLand.BlockchainIndexer.Server/package.json
#	CirclesLand.BlockchainIndexer.Tests/CirclesLand.BlockchainIndexer.Tests.csproj
#	CirclesLand.BlockchainIndexer/CirclesLand.BlockchainIndexer.csproj
# Conflicts:
#	CirclesLand.BlockchainIndexer.Server/package.json
#	CirclesLand.BlockchainIndexer/Indexer..cs
# Conflicts:
#	package.json
@almereyda almereyda marked this pull request as draft February 8, 2023 00:23
@almereyda almereyda requested a review from jaensen February 8, 2023 00:26
@almereyda almereyda mentioned this pull request Feb 8, 2023
@almereyda almereyda marked this pull request as ready for review March 28, 2023 16:23
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