From: hayao <hayao@fascode.net>
Date: Sun, 16 May 2021 04:46:48 +0000 (+0900)
Subject: Merge branch 'dev' into no-firewalld
X-Git-Tag: 20210705~130^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc4fa5658308b6aaeec39cf4338f23e4a8f2834e;p=alterlinux%2Falterlinux.git

Merge branch 'dev' into no-firewalld
---

dc4fa5658308b6aaeec39cf4338f23e4a8f2834e