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

Merge branch 'release-2.3'

Conflicts:
	themes/bootstrap3/templates/browse/home.phtml
	themes/bootstrap3/templates/record/view.phtml
	themes/bootstrap3/templates/search/newitem.phtml
	themes/bootstrap3/templates/search/results.phtml
parents 660ab56f 230dad2a
No related merge requests found
Showing
with 1887 additions and 372 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