bergquist 26c6437846 Merge branch 'master' into alerting

2016-08-22 12:27:08 +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

Test environment override for secret and url with credentials

2016-06-29 13:49:41 +02:00

setting.go

Merge branch 'master' into alerting

2016-08-22 12:27:08 +02:00