dashfolders: merge conflict

2018-01-25 14:54:50 +01:00
parent 94a54248c1 4cfe179f47
commit bc5fae5367
1824 changed files with 262501 additions and 173759 deletions
@@ -8,6 +8,7 @@ type SystemStats struct {
 	Orgs        int64
 	Playlists   int64
 	Alerts      int64
+	Stars       int64
 }

 type DataSourceStats struct {