Merge branch 'MDL-64887-master-3' of git://github.com/bmbrands/moodle

diff --cc .eslintignore
Simple merge

diff --cc .stylelintignore
Simple merge

diff --cc theme/boost/amd/build/alert.min.js
index c35cfe6,7e5873b..64e09a6
Binary files differ

diff --cc theme/boost/amd/build/alert.min.js.map
index 39717f3,0000000..f1fde5a
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/button.min.js
index 3153f86,662e61d..46bc89d
Binary files differ

diff --cc theme/boost/amd/build/button.min.js.map
index ede79d9,0000000..6f26ee8
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/carousel.min.js
index 6cde87a,5aeb51d..cb5ac7f
Binary files differ

diff --cc theme/boost/amd/build/carousel.min.js.map
index 8e816ca,0000000..e10ccf3
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/collapse.min.js
index 0cfcccd,720ace9..8181a61
Binary files differ

diff --cc theme/boost/amd/build/collapse.min.js.map
index 1f3e11f,0000000..d9fddcf
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/dropdown.min.js
index 99c9c55,2c6fd0c..873610d
Binary files differ

diff --cc theme/boost/amd/build/dropdown.min.js.map
index 1df6567,0000000..9f70529
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/index.min.js
index 0000000,577f992..f814773
mode 000000,100644..100644
Binary files differ

diff --cc theme/boost/amd/build/index.min.js.map
index 0000000,0000000..ecb4a7d
new file mode 100644 (file)
Binary files differ

diff --cc theme/boost/amd/build/loader.min.js
index 5a5653a,8b05b19..bba4253
Binary files differ

diff --cc theme/boost/amd/build/loader.min.js.map
index ba5e958,0000000..2a85064
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/modal.min.js
index 5a10e23,033d933..79776f5
Binary files differ

diff --cc theme/boost/amd/build/modal.min.js.map
index abba959,0000000..e99e0ea
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/pending.min.js
index c9119c3,4c54a93..d231b81
Binary files differ

diff --cc theme/boost/amd/build/pending.min.js.map
index ad23087,0000000..74549e2
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/popover.min.js
index cb5ae93,37938c7..0da7d94
Binary files differ

diff --cc theme/boost/amd/build/popover.min.js.map
index b782398,0000000..bf5da46
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/sanitizer.min.js
index 0000000,f318ed7..4a13778
mode 000000,100644..100644
Binary files differ

diff --cc theme/boost/amd/build/sanitizer.min.js.map
index 0000000,0000000..f939757
new file mode 100644 (file)
Binary files differ

diff --cc theme/boost/amd/build/scrollspy.min.js
index 9cbb45e,9178603..b64028d
Binary files differ

diff --cc theme/boost/amd/build/scrollspy.min.js.map
index 6807ef4,0000000..63f0a8c
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/tab.min.js
index d8925c1,7fbaecf..099bb3a
Binary files differ

diff --cc theme/boost/amd/build/tab.min.js.map
index 6392625,0000000..2f508e9
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/toast.min.js
index 0000000,eccf5d2..74b8fc2
mode 000000,100644..100644
Binary files differ

diff --cc theme/boost/amd/build/toast.min.js.map
index 0000000,0000000..c28810c
new file mode 100644 (file)
Binary files differ

diff --cc theme/boost/amd/build/tooltip.min.js
index db41ae0,40e96b3..4acc4c0
Binary files differ

diff --cc theme/boost/amd/build/tooltip.min.js.map
index 80c3ee4,0000000..bdb80a0
mode 100644,000000..100644
Binary files differ

diff --cc theme/boost/amd/build/util.min.js
index 689db6b,6398795..37e7acf
Binary files differ

diff --cc theme/boost/amd/build/util.min.js.map
index 65cc8ba,0000000..75d109e
mode 100644,000000..100644
Binary files differ