Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-07-05 16:04:39 +02:00
commit b95710bb3a
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
12 changed files with 99 additions and 10 deletions

View file

@ -85,6 +85,7 @@ export default {
let moderationLabel = this.$pgettext('Content/Admin/Menu', 'Moderation')
let subsonicLabel = this.$pgettext('Content/Admin/Menu', 'Subsonic')
let statisticsLabel = this.$pgettext('Content/Admin/Menu', 'Statistics')
let uiLabel = this.$pgettext('Content/Admin/Menu', 'User Interface')
let errorLabel = this.$pgettext('Content/Admin/Menu', 'Error reporting')
return [
{
@ -143,6 +144,11 @@ export default {
id: "subsonic",
settings: ["subsonic__enabled"]
},
{
label: uiLabel,
id: "ui",
settings: ["ui__custom_css"]
},
{
label: statisticsLabel,
id: "statistics",