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
..
eventpublisher	no unbound recursion in publish()	2015-05-18 10:04:01 -04:00
notifications	fix(email notifications): added error handling to email template parsing, fixes #2690	2015-09-08 10:57:47 +02:00
search	Fixed case insensitive search for file based dashboards, Fixes #2258	2015-06-30 08:17:28 +02:00
sqlstore	Merge branch 'master' into external-plugins	2015-12-14 17:28:57 +01:00