Merge branch 'master' of https://github.com/vufind-org/vufind (c6122b8a) · 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 c6122b8a authored 11 years ago by

Chris Hallberg

Browse files

Merge branch 'master' of https://github.com/vufind-org/vufind

Conflicts:
	themes/bootstrap/js/common.js

parents 38ec9dcf a232d357

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 168 additions and 84 deletions

Please register or to comment

Admin message

Merge branch 'master' of https://github.com/vufind-org/vufind