Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle

2018-05-11 11:31:22 +02:00
parent cef2c013d2 ee66104098
commit b96a064f14
2 changed files with 0 additions and 2 deletions
@@ -233,7 +233,6 @@ if ($hassiteconfig) {
        '*, 16',
        'AT, 14',
        'ES, 14',
-        'SI, 14',
        'US, 13'
    ]);
    $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
@@ -2222,7 +2222,6 @@ function xmldb_main_upgrade($oldversion) {
            '*, 16',
            'AT, 14',
            'ES, 14',
-            'SI, 14',
            'US, 13'
        ]);
        set_config('agedigitalconsentmap', $ageofdigitalconsentmap);