Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting ...

Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go

2016-07-11 18:28:07 +02:00

..

defaults.ini

Merge branch 'master' into alerting

2016-07-11 18:28:07 +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

conf(): updated sample config and root_url to better explain it

2016-07-05 14:10:23 +02:00