Merge branch 'master' of github.com:grafana/grafana

public/app/plugins/panel/graph/axisEditor.html

@@ -181,7 +181,7 @@
 				<li class="tight-form-item">
 					<editor-checkbox text="Right side" model="ctrl.panel.legend.rightSide" change="ctrl.render()"></editor-checkbox>
 				</li>
-				<li ng-if="panel.legend.rightSide" class="tight-form-item">
+				<li ng-if="ctrl.panel.legend.rightSide" class="tight-form-item">
 					Side width
 				</li>
 				<li ng-if="ctrl.panel.legend.rightSide" style="width: 105px">