Merge branch 'origin-minsoc_hotline_109030_delete_not_selected_keywords_search' into minsoc_prod (265bdf44) · Commits · afi / opacce · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 265bdf44 authored 4 years ago by

minsoc

Merge branch 'origin-minsoc_hotline_109030_delete_not_selected_keywords_search' into minsoc_prod

# Conflicts:
#	library/ZendAfi/Form/Decorator/AuthorityPicker.php
#	public/opac/js/authority_picker/tests.js

parents c4975f6b c8ec73d1

Branches

Tags

2 merge requests!3589Hotline,!3516Minsoc prod

Pipeline #10318 failed with stage

in 40 minutes and 24 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 10 additions and 4 deletions

Please register or to comment