Skip to content
Snippets Groups Projects
Commit 12f8fb35 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

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

Conflicts:
	themes/bootstrap/templates/record/sms.phtml
parents 8bebcaeb c9e7c4a4
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment