From: Dan Brown <redacted>
Date: Sun, 2 Jul 2017 15:13:28 +0000 (+0100)
Subject: Merge branch 'S64-japanese-translation'
X-Git-Tag: v0.17.0^2~5
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7293ad7b24b63a9b7f0a46182b9fba7fd15a2387?ds=inline

Merge branch 'S64-japanese-translation'
---

7293ad7b24b63a9b7f0a46182b9fba7fd15a2387