Merge branch 'unicode' of git://github.com/kostasdizas/BookStack into kostasdizas...

author Dan Brown <redacted>

Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)

committer Dan Brown <redacted>

Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)
author Dan Brown <redacted>
Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)
committer Dan Brown <redacted>
Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)
diff --cc app/Http/Middleware/Localization.php
Simple merge
diff --cc resources/views/base.blade.php
Simple merge
diff --cc resources/views/vendor/notifications/email.blade.php
Simple merge
author	Dan Brown <redacted>
	Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)
committer	Dan Brown <redacted>
	Sun, 18 Aug 2019 17:51:20 +0000 (18:51 +0100)
		1	2
app/Http/Middleware/Localization.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/base.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/vendor/notifications/email.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history