From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Sun, 11 Oct 2020 15:35:17 +0000 (+0900)
Subject: Merge branch 'master' into pomconfig
X-Git-Tag: v1.504.8^2~2^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2e959a980ef2cdb86da302ce4d4b51e0134dd2df;p=jindolf%2FJinArchiver.git

Merge branch 'master' into pomconfig
---

2e959a980ef2cdb86da302ce4d4b51e0134dd2df