Skip to content
Commit f5f7fb53 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge remote-tracking branch 'github/adminui_singleMetricView' into fnordmetric2

Conflicts:
	fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js
	fnordmetric-webui/fnordmetric-webui-singlemetricview.js
	fnordmetric-webui/fnordmetric-webui.css
parents 5adfd100 19df8f04
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
Baidu
map