Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' ...

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

2016-06-16 08:06:43 +02:00

..

defaults.ini

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +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 'export-dashboard'

2016-06-16 08:06:43 +02:00