Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ... Conflicts: pkg/api/login.go public/app/core/routes/all.js public/app/core/table_model.ts public/app/panels/table/table_model.ts public/app/plugins/panels/table/editor.ts public/app/plugins/panels/table/table_model.ts		2015-12-14 17:28:57 +01: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	fix(tests): fixed failling backend test	2015-09-11 08:58:45 +02:00
setting.go	Merge branch 'master' into external-plugins	2015-12-14 17:28:57 +01:00