Torkel Ödegaard 69d0e82453 Merge branch 'master' into apps ...

Conflicts:
	pkg/services/sqlstore/migrations/migrations.go

2016-01-08 10:20:46 +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 apps

2016-01-08 10:20:46 +01:00