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

..

defaults.ini

Merge branch 'new-logger' into alerting_definitions

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

ldap.toml

new config option for source of %s in group_search_filter, useful for nested LDAP groups

2016-03-23 08:21:25 -04:00

sample.ini

feat(logging): added loging filters

2016-06-07 12:11:41 +02:00