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

moodle · May 11, 2018 · b96a064 · b96a064
2 parents cef2c01 + ee66104
commit b96a064
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/admin/settings/users.php b/admin/settings/users.php
@@ -233,7 +233,6 @@
         '*, 16',
         'AT, 14',
         'ES, 14',
-        'SI, 14',
         'US, 13'
     ]);
     $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -2222,7 +2222,6 @@ function xmldb_main_upgrade($oldversion) {
             '*, 16',
             'AT, 14',
             'ES, 14',
-            'SI, 14',
             'US, 13'
         ]);
         set_config('agedigitalconsentmap', $ageofdigitalconsentmap);