IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.0.x'

Browse Source 
Conflicts:
	conf/sample.ini
This commit is contained in:
Torkel Ödegaard
2015-04-29 15:59:35 +02:00
parent 74a8fa61f2 d10ce90936
commit 294f7f1f0d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/routes/dashLoadControllers.js
View File

@@ -90,7 +90,7 @@ function (angular, _, kbn, moment, $) {
}
return result.data;
},function() {
$scope.appEvent('alert-error', ["Dashboard load failed", "Could not load <i>dashboards/"+file+"</i>. Please make sure it exists"]);
$scope.appEvent('alert-error', ["Dashboard load failed", "Could not load "+file+". Please make sure it exists"]);
return false;
});
};