From: Dan Brown <redacted>
Date: Sun, 2 Jul 2017 15:09:12 +0000 (+0100)
Subject: Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japane... 
X-Git-Tag: v0.17.0^2~5^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c5b58d8fd20a85a56a8903a0cf15047a9b9fed41

Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation
---

c5b58d8fd20a85a56a8903a0cf15047a9b9fed41