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

Merge branch 'release-2.5' into release-3.0

Conflicts:
	themes/bootstrap3/js/record.js
parents d74eb618 4580fb21
Branches
Tags
No related merge requests found
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