Commit 260a3269 authored by longpanda's avatar longpanda
Browse files

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

# Conflicts:
#	INSTALL/ventoy/ventoy.cpio
parents a287bf89 48a1b80b
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment