Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

chore: sync changes from mainline 1c25b55...2604e59 #583

Merged
merged 4 commits into from
Mar 2, 2022

Conversation

carvantes
Copy link
Contributor

@carvantes carvantes commented Mar 1, 2022

Update smart-develop to be in sync with develop

Here is the list of develop commits that are included in this PR: 1c25b55...2604e59

The only notable difference is that I collapsed all dependabot commits into a single one. It's easier to deal with conflicts that way.

Checklist:

  • Have you successfully deployed to an AWS account with your changes?
  • [n/a] Have you written new tests for your core changes, as applicable?

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@carvantes carvantes changed the title chore: sync changes from mainline chore: sync changes from mainline 1c25b55...2604e59 Mar 2, 2022
@carvantes carvantes merged commit c91e731 into smart-develop Mar 2, 2022
@carvantes carvantes deleted the dev-smart-sync branch March 2, 2022 09:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants