Torkel Ödegaard 05697d5ecd Merge branch 'master' into alerting ... Conflicts: conf/sample.ini		2016-08-17 10:03:33 +02:00
..
defaults.ini	Merge branch 'master' into alerting	2016-08-17 10:03:33 +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	Merge branch 'master' into alerting	2016-08-17 10:03:33 +02:00