Merge branch 'master' into t/merge-master (dfb4b1e6) · Commits · ubl / finc / vufind

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 dfb4b1e6 authored 12 years ago by

David Maus

Browse files

Merge branch 'master' into t/merge-master

Conflicts:
	module/VuFind/src/VuFind/Search/Solr/Params.php

parents 632ab509 fcd48244

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 524 additions and 382 deletions

Please register or to comment

Admin message

Merge branch 'master' into t/merge-master