Torkel Ödegaard 0667d73660 Merge branch 'new-logger' into alerting_definitions ... Conflicts: pkg/api/api.go pkg/setting/setting.go		2016-06-07 13:31:56 +02:00
..
alerting	Merge branch 'new-logger' into alerting_definitions	2016-06-07 13:31:56 +02: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	refactor(): refactoring json usage	2016-03-12 00:13:06 +01:00
sqlstore	Merge branch 'new-logger' into alerting_definitions	2016-06-07 13:31:56 +02:00