Skip to content
Snippets Groups Projects
user avatar
Chris Hallberg authored
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
ce2f4b7c