Torkel Ödegaard f36a44c49a Merge branch 'master' into alerting_definitions ...

Conflicts:
	conf/defaults.ini
	pkg/api/dashboard.go

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

..

setting_oauth.go

Add allow_sign_up override for auth.google/github.

2015-04-16 13:43:18 -08:00

setting_quota.go

move toMap function to be a method on the quota structs

2015-09-15 17:18:26 +08:00

setting_smtp.go

Final work password reset email, Closes #1456

2015-06-08 18:25:04 +02:00

setting_test.go

feat(instrumentation): work on settings model for internal metrics publishing, #4696

2016-06-02 14:32:17 +02:00

setting.go

Merge branch 'master' into alerting_definitions

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