Merge branch 'MDL-65747' of git://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 06:33:10 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Jul 2019 06:33:10 +0000 (14:33 +0800)
1  2 
.eslintignore
.stylelintignore
lib/thirdpartylibs.xml
lib/upgrade.txt

diff --cc .eslintignore
Simple merge
Simple merge
Simple merge
diff --cc lib/upgrade.txt
@@@ -12,7 -12,7 +12,8 @@@ information provided here is intended e
      * allow_override()
      * allow_assign()
      * allow_switch()
 +* Remove duplicate font-awesome SCSS, Please see /theme/boost/scss/fontawesome for usage (MDL-65936)
+ * Remove lib/pear/Crypt/CHAP.php (MDL-65747)
  
  === 3.7 ===