From aa613bc767f4488dec14885e81168edfc3197c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 1 Feb 2015 15:46:24 +0100
Subject: [PATCH] updated frontend

---
 '       | 46 ----------------------------------------------
 grafana |  2 +-
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 '

diff --git a/' b/'
deleted file mode 100644
index 33a5fbfaf00..00000000000
--- a/'
+++ /dev/null
@@ -1,46 +0,0 @@
-  <div class="editor-row">
-		<div class="section">
-			<div>
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 148px">
-						<strong>Relative time options</strong></small>
-					</li>
-					<li>
-						<input type="text" class="input-xlarge tight-form-input"
-							ng-model="panel.time_options" array-join>
-				  </li>
-					<li class="tight-form-item">
-						Until
-					</li>
-					<li class="tight-form-item">
-					 now-
-					</li>
-					<li>
-						<input type="text" class="input-mini tight-form-input last"
-						  ng-model="panel.nowDelay" placeholder="0m" bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'" data-placement="right">
-				  </li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
-			<div class="tight-form">
-				<ul class="tight-form-list">
-					<li class="tight-form-item" style="width: 148px">
-						<strong>Auto-refresh options</strong>
-					</li>
-					<li>
-						<input type="text" class="input-xlarge tight-form-input"
-							ng-model="panel.refresh_intervals" array-join>
-				  </li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
-			</div>
-
-			<p>
-			<br>
-			<i class="fa fa-info-circle"></i>
-			For these changes to fully take effect save and reload the dashboard.
-		</i>
-	</div>
-</div>
diff --git a/grafana b/grafana
index 3da90e09d59..d272b0f56d5 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 3da90e09d595518a143bf5ec1462d252fcd5ae72
+Subproject commit d272b0f56d52f31acb99d0e232cc50bc49338809