Merge branch 'MDL-60848_master' of https://github.com/markn86/moodle

valmynd · Apr 13, 2018 · 1c40655 · 1c40655
2 parents 20bf0c4 + e41a561
commit 1c40655
Show file tree

Hide file tree

Showing 34 changed files with 8,876 additions and 4 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -56,6 +56,7 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
+lib/amd/src/adapter.js
 lib/validateurlsyntax.php
 lib/amd/src/popper.js
 media/player/videojs/amd/src/video-lazy.js

diff --git a/.stylelintignore b/.stylelintignore
@@ -57,6 +57,7 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
+lib/amd/src/adapter.js
 lib/validateurlsyntax.php
 lib/amd/src/popper.js
 media/player/videojs/amd/src/video-lazy.js

diff --git a/lib/amd/build/adapter.min.js b/lib/amd/build/adapter.min.js