Merge branch 'velvet' of github.com:FJLabs-Designs/keyboards into velvet · the-via/keyboards@fbbe079 · GitHub

Commit

Merge branch 'velvet' of github.com:FJLabs-Designs/keyboards into velvet

Browse files

# Conflicts:
#	src/maker/velvet/velvet.json

Loading branch information

mrnoisytiger committed Apr 20, 2023

2 parents a7d7a7c + f0930d1 commit fbbe079