From: msaus <redacted>
Date: Wed, 28 Mar 2018 02:58:14 +0000 (+0900)
Subject: Merge branch 'master' into update_japanese_translation
X-Git-Tag: v0.21.0~1^2~13^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/767/head?hp=-c

Merge branch 'master' into update_japanese_translation
---

03ee3d21bab5ef1b8fc09de27f3aa8115d947dd1