Merge branch 'master' into file-v3

# Conflicts:
#	config/version.yml
This commit is contained in:
Mathieu Lagacé
2020-10-13 14:48:50 -04:00
30 changed files with 908 additions and 922 deletions

View File

@@ -95,7 +95,7 @@ $sidebar = [
'Configuration' => [
'route' => null,
'icon' => 'menu_book',
'perm' => 'config_edit',
'perm' => 'config_see',
'child' => [
'Général' => [
'route' => 'admin.config.general',
@@ -136,7 +136,7 @@ $sidebar = [
'Apparence' => [
'route' => 'admin.config.customisation',
'icon' => 'fas fa-palette',
'perm' => 'config_edit_instruction',
'perm' => 'config_edit_customization',
'child' => null
]
]