Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
admin/settings/users.php
lib/db/upgrade.php

index ac9c15b..3adbf0b 100644 (file)
@@ -233,7 +233,6 @@ if ($hassiteconfig) {
         '*, 16',
         'AT, 14',
         'ES, 14',
-        'SI, 14',
         'US, 13'
     ]);
     $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
index 5e8fcd3..55b0a23 100644 (file)
@@ -2222,7 +2222,6 @@ function xmldb_main_upgrade($oldversion) {
             '*, 16',
             'AT, 14',
             'ES, 14',
-            'SI, 14',
             'US, 13'
         ]);
         set_config('agedigitalconsentmap', $ageofdigitalconsentmap);