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

Merge branch 'release-2.3' 

Conflicts:
	themes/bootstrap3/css/combined-search.css
	themes/bootstrap3/templates/combined/results.phtml
	themes/bootstrap3/templates/combined/stack-distributed.phtml
	themes/bootstrap3/templates/combined/stack-left.phtml
	themes/bootstrap3/templates/combined/stack-right.phtml
parents aeaaacb4 5c1b00f1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 62 additions and 25 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