Merge feature/release-13-1 into feature/release-13-1__sailor-firstmiddlelast-name-and-suffix-plus-flow-to-update-name-field

SFDO-Community / OmbudsmanCloudCare

App for Navy ombudsmen to track, resolve, and report on cases.

BSD 3-Clause "New" or "Revised" License

10 stars 5 forks source link

Closed ghost closed 3 years ago

ghost commented 3 years ago

This pull request was automatically generated because an automated merge hit a merge conflict

Nickers3 commented 3 years ago

@mkolodner gonna try what has worked in other instances - do a pull request from the feature branch so they are in alignment.