Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:54:22 +0000 (07:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 07:54:22 +0000 (07:54 +0000)
1  2 
lang/en/deprecated.txt
lib/adminlib.php
lib/formslib.php

@@@ -62,10 -62,4 +62,11 @@@ userssearchresults,core_messag
  loginpasswordautocomplete,core_admin
  loginpasswordautocomplete_help,core_admin
  deletecomment,core
- signinwithyouremail,core_badges
 +personaconnection,core_badges
 +personaconnection_help,core_badges
 +error:noassertion,core_badges
 +error:personaneedsjs,core_badges
 +error:badjson,core_badges
 +error:backpackloginfailed,core_badges
++signinwithyouremail,core_badges
+ sectionusedefaultname,core
Simple merge
Simple merge