Merge branch 'master' of git://github.com/albergoniSivaf/BookStack into albergoniSiva...

author Dan Brown <redacted>

Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)

committer Dan Brown <redacted>

Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)
author Dan Brown <redacted>
Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)
committer Dan Brown <redacted>
Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)
diff --cc resources/js/services/code.js
Simple merge
diff --cc resources/views/components/code-editor.blade.php
Simple merge
author	Dan Brown <redacted>
	Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)
committer	Dan Brown <redacted>
	Fri, 27 Dec 2019 17:03:10 +0000 (17:03 +0000)
		1	2
resources/js/services/code.js	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/components/code-editor.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history