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

Merge branch 'master' into error_codes

Conflicts:
	themes/bootstrap3/js/record.js
parents 5d5df5cd f1528c2b
No related merge requests found
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