From: longpanda <admin@ventoy.net>
Date: Fri, 11 Sep 2020 18:49:39 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/ventoy/Ventoy
X-Git-Tag: v1.0.21~1
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/260a3269b71db3e026ddbbcfddc884fbc3104d70

Merge branch 'master' of https://github.com/ventoy/Ventoy

# Conflicts:
#	INSTALL/ventoy/ventoy.cpio
---

260a3269b71db3e026ddbbcfddc884fbc3104d70