Merge branch 'MDL-56389' of https://github.com/paulholden/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)
diff --cc message/output/popup/amd/build/notification_popover_controller.min.js

index aca97e2,aae7cce..0032380

Binary files differ
diff --cc message/output/popup/amd/build/notification_popover_controller.min.js.map

index 9ccabb5,757c167..daeb2bc

Binary files differ
diff --cc message/output/popup/amd/src/notification_popover_controller.js
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 28 Jan 2020 10:04:05 +0000 (11:04 +0100)
		1	2
message/output/popup/amd/build/notification_popover_controller.min.js	patch \|	diff1 \|	diff2 \|	blob \| history
message/output/popup/amd/build/notification_popover_controller.min.js.map	patch \|	diff1 \|	diff2 \|	blob \| history
message/output/popup/amd/src/notification_popover_controller.js	patch \|	diff1 \|	diff2 \|	blob \| history