merge release-0.6.3 bugfix branch into master

bcgov / namerequest

Public Front End for the Name Request System

1 stars 44 forks source link

merge release-0.6.3 bugfix branch into master #315

Closed severinbeauvais closed 3 years ago

severinbeauvais commented 3 years ago

DO NOT MERGE UNTIL RELEASE-0.6.3 IS PUSHED THROUGH TO PROD

Issue #: /bcgov/entity#6236 /bcgov/entity#6574

Description of changes:

merging fixes for tickets above from bugfix branch into master

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namerequest license (Apache 2.0).

severinbeauvais commented 3 years ago

Just figuring out to fix the conflicts then ready for review + merge...

severinbeauvais commented 3 years ago

I'm not sure how to merge one branch into another, so I created #316 and am closing THIS PR.