mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						dfec8f74fb
					
				@ -4,9 +4,9 @@
 | 
			
		||||
    "url": "https://github.com/adereth/dactyl-keyboard",
 | 
			
		||||
    "maintainer": "Matt Adereth",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "vid": "0xFEED",
 | 
			
		||||
        "pid": "0x3060",
 | 
			
		||||
        "device_version": "0.0.1"
 | 
			
		||||
        "vid": "0x444C",
 | 
			
		||||
        "pid": "0xA460",
 | 
			
		||||
        "device_version": "1.0.0"
 | 
			
		||||
    },
 | 
			
		||||
    "features": {
 | 
			
		||||
        "bootmagic": true,
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user