Merge branch 'master' into feature/edit-link-headers

author Dan Brown <redacted>

Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)

committer Dan Brown <redacted>

Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
author Dan Brown <redacted>
Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
committer Dan Brown <redacted>
Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
diff --cc resources/assets/js/components/page-display.js
Simple merge
diff --cc resources/assets/sass/_pages.scss
Simple merge
diff --cc resources/lang/es/entities.php
Simple merge
author	Dan Brown <redacted>
	Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
committer	Dan Brown <redacted>
	Sat, 14 Jul 2018 08:36:14 +0000 (09:36 +0100)
		1	2
resources/assets/js/components/page-display.js	patch \|	diff1 \|	diff2 \|	blob \| history
resources/assets/sass/_pages.scss	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/es/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history