Merge branch 'MDL-52777-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 19 Oct 2016 01:59:27 +0000 (09:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 19 Oct 2016 01:59:27 +0000 (09:59 +0800)
1  2 
.stylelintignore
theme/bootstrapbase/style/moodle.css

@@@ -1,9 -1,9 +1,11 @@@
  # Generated by "grunt ignorefiles"
  theme/bootstrapbase/style/
 +theme/clean/style/custom.css
 +theme/more/style/custom.css
  node_modules/
  vendor/
+ admin/tool/usertours/amd/src/tour.js
+ admin/tool/usertours/amd/src/popper.js
  auth/cas/CAS/
  auth/fc/fcFPP.php
  enrol/lti/ims-blti/
Simple merge