Skip to content
Commit 62e25488 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'ispc/master' into new-layout-3.1 

Conflicts:
	interface/web/themes/default/templates/main.tpl.htm
parents 77cc4a99 ccfc84e6
Hide whitespace changes
Inline Side-by-side
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