Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions ...

Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go

2016-06-07 13:31:56 +02:00

..

main.go

Merge branch 'new-logger' into alerting_definitions

2016-06-07 13:31:56 +02:00

web.go

feat(loggin): improved http request panic handling

2016-06-07 10:05:10 +02:00