Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 01:39:48 +0000 (09:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 01:39:48 +0000 (09:39 +0800)
1  2 
lang/en/admin.php
lang/en/deprecated.txt
lib/adminlib.php

Simple merge
@@@ -35,6 -35,4 +35,7 @@@ downloadtsv,core_tabl
  downloadxhtml,core_table
  invalidpersistent,core_competency
  revealpassword,core_form
 -mobile,core_admin
 +mediasettings,core_media
 +legacyheading,core_media
 +legacyheading_desc,core_media
++mobile,core_admin
Simple merge