Merge branch 'MDL-61714-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

2018-05-11 11:31:36 +02:00
parent 5bcf683030 1f89dde34f
commit c4a24dbc2e
2 changed files with 0 additions and 2 deletions
@@ -232,7 +232,6 @@ if ($hassiteconfig) {
        '*, 16',
        'AT, 14',
        'ES, 14',
-        'SI, 14',
        'US, 13'
    ]);
    $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
@@ -2841,7 +2841,6 @@ function xmldb_main_upgrade($oldversion) {
            '*, 16',
            'AT, 14',
            'ES, 14',
-            'SI, 14',
            'US, 13'
        ]);
        set_config('agedigitalconsentmap', $ageofdigitalconsentmap);