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
						f03f89ccb5
					
				@ -12,7 +12,7 @@
 | 
				
			|||||||
        "nkro": true
 | 
					        "nkro": true
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "processor": "STM32F401",
 | 
					    "processor": "STM32F401",
 | 
				
			||||||
    "board": "BLACKPILL_STM32_F411",
 | 
					    "board": "BLACKPILL_STM32_F401",
 | 
				
			||||||
    "url": "https://github.com/diepala/cantor",
 | 
					    "url": "https://github.com/diepala/cantor",
 | 
				
			||||||
    "usb": {
 | 
					    "usb": {
 | 
				
			||||||
        "device_version": "1.0.0",
 | 
					        "device_version": "1.0.0",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user