Merge branch 'v4-dev' into fix-jumping-modal-on-resize

author Johann-S <johann.servoire@gmail.com>

Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)

committer GitHub <noreply@github.com>

Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)
author Johann-S <johann.servoire@gmail.com>
Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)
committer GitHub <noreply@github.com>
Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)
diff --cc js/src/modal.js
Simple merge
diff --cc js/tests/unit/modal.js
Simple merge
author	Johann-S <johann.servoire@gmail.com>
	Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)
committer	GitHub <noreply@github.com>
	Sun, 3 Sep 2017 10:56:04 +0000 (12:56 +0200)
		1	2
js/src/modal.js	patch \|	diff1 \|	diff2 \|	blob \| history
js/tests/unit/modal.js	patch \|	diff1 \|	diff2 \|	blob \| history