Skip to content

Commit

Permalink
Merge branch 'MDL-61714-33' of git://github.com/sarjona/moodle into M…
Browse files Browse the repository at this point in the history
…OODLE_33_STABLE
  • Loading branch information
David Monllao committed May 11, 2018
2 parents c31ed14 + c52dac6 commit 56141c5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion admin/settings/users.php
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@
'*, 16',
'AT, 14',
'ES, 14',
'SI, 14',
'US, 13'
]);
$setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
Expand Down
1 change: 0 additions & 1 deletion lib/db/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2991,7 +2991,6 @@ function xmldb_main_upgrade($oldversion) {
'*, 16',
'AT, 14',
'ES, 14',
'SI, 14',
'US, 13'
]);
set_config('agedigitalconsentmap', $ageofdigitalconsentmap);
Expand Down

0 comments on commit 56141c5

Please sign in to comment.