pkg/setting/setting.go · f387e39b67ed5d766680a4a1a90d99b11f7aa1cc · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

Blame History Permalink

Merge branch 'new-logger' into alerting_definitions · 0667d736
```
Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go
```
Torkel Ödegaard committed Jun 07, 2016
0667d736

setting.go 15.5 KB