Merge branch 'master' into 129-page-templates

author Dan Brown <redacted>

Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)

committer Dan Brown <redacted>

Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
author Dan Brown <redacted>
Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
committer Dan Brown <redacted>
Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
diff --cc resources/assets/sass/_pages.scss
Simple merge
diff --cc resources/lang/en/settings.php
Simple merge
diff --cc resources/views/pages/edit.blade.php
Simple merge
diff --cc resources/views/settings/roles/form.blade.php
Simple merge
author	Dan Brown <redacted>
	Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
committer	Dan Brown <redacted>
	Sun, 4 Aug 2019 15:26:38 +0000 (16:26 +0100)
		1	2
resources/assets/sass/_pages.scss	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/pages/edit.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/settings/roles/form.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history