search

silverstripe / silverstripe-asset-admin

Silverstripe assets gallery for asset management
BSD 3-Clause "New" or "Revised" License
19 stars 78 forks source link

MNT Update jest tests for archive text #1379

Closed emteknetnz closed 11 months ago

emteknetnz commented 11 months ago

Issue https://github.com/silverstripe/silverstripe-versioned-admin/issues/300

GuySartorelli commented 11 months ago

Merge up failed due to merge conflicts: https://github.com/silverstripe/silverstripe-asset-admin/actions/runs/5792638035/job/15699211485 But I don't think that holds this PR up in any way. Please rebase so that the only commit is the new changes.

emteknetnz commented 11 months ago

Have rebased

GuySartorelli commented 11 months ago

Please resolve the merge conflict

emteknetnz commented 11 months ago

Resolved