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

Merge branch 'error_codes' of http://github.com/crhallberg/vufind into error_codes

Conflicts:
	themes/bootstrap3/js/common.js
	themes/bootstrap3/js/record.js
parents 69eaa843 a632702f
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