Torkel Ödegaard 0e44fe082b Merge branch 'master' into develop		2017-11-17 15:49:17 +01:00
..
acl.go	acl fixes	2017-06-22 17:10:43 -04:00
alerting.go	…
annotations.go	annotations: add endpoint for writing graphite-like events (#9495)	2017-10-12 10:12:15 +02:00
apikey.go	…
dashboard.go	dashfolders: use canadmin permission in settings menu	2017-06-23 00:36:17 +02:00
datasource.go	datasource as cfg: adds readonly datasources	2017-11-15 14:30:32 +01:00
index.go	newgrid: various fixes	2017-10-11 21:36:03 +02:00
invite.go	…
models.go	Merge branch 'master' into develop	2017-10-26 15:59:50 +02:00
org.go	…
playlist.go	…
plugins.go	…
prefs.go	…
stream.go	…
user.go	fix: update user permissions validation was not working properly, fixes #8977	2017-08-03 08:56:34 +02:00