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

Merge branch 'release-2.3'

Conflicts:
	themes/bootstrap3/templates/search/searchbox.phtml
parents 59589dde 6dc8dab4
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