search

opencrvs / opencrvs-core

A global solution to civil registration
https://www.opencrvs.org
Other
85 stars 67 forks source link

🍒 Merge changes from PR #7093 to release-v1.5.0 #7196

Closed github-actions[bot] closed 3 months ago

github-actions[bot] commented 3 months ago

Automated PR to merge changes from develop to release-v1.5.0

I failed to cherry-pick the changes automatically because of the following:

  Auto-merging packages/client/index.html
CONFLICT (content): Merge conflict in packages/client/index.html
Auto-merging packages/client/src/components/ProtectedPage.tsx
CONFLICT (content): Merge conflict in packages/client/src/components/ProtectedPage.tsx
error: could not apply ca5e144a1... feat: added progressbar when loading #6641 (#6894)

To continue manually you can use these commands:

  git fetch origin auto-pr-release-v1.5.0-7093-15790:auto-pr-release-v1.5.0-7093-15790
  git fetch origin ocrvs-7065:ocrvs-7065

  git checkout auto-pr-release-v1.5.0-7093-15790
  git reset --hard HEAD~1  # Remove placeholder commit
  git cherry-pick d260ef82addd33f652282ea3db12d27a43f3b8c2..9af86a11c88ba7e4aaad46e2cacd85e28c55ca4e