Merge branch 'alerting' into alerting_notifications

This commit is contained in:
bergquist
2016-06-16 16:49:16 +02:00
88 changed files with 2227 additions and 787 deletions
+2
View File
@@ -55,6 +55,8 @@ func Register(r *macaron.Macaron) {
r.Get("/dashboard/*", reqSignedIn, Index)
r.Get("/dashboard-solo/*", reqSignedIn, Index)
r.Get("/import/dashboard", reqSignedIn, Index)
r.Get("/dashboards/*", reqSignedIn, Index)
r.Get("/playlists/", reqSignedIn, Index)
r.Get("/playlists/*", reqSignedIn, Index)