Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -5,7 +5,7 @@
 | 
			
		||||
  "maintainer": "qmk",
 | 
			
		||||
  "usb": {
 | 
			
		||||
    "vid": "0x4025",
 | 
			
		||||
    "vid": "0x9999",
 | 
			
		||||
    "pid": "0x9999",
 | 
			
		||||
    "device_version": "99.9.9"
 | 
			
		||||
  },
 | 
			
		||||
  "layouts": {
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
    "maintainer": "qmk",
 | 
			
		||||
    "usb": {
 | 
			
		||||
      "vid": "0x4025",
 | 
			
		||||
      "pid": "0xA0C",
 | 
			
		||||
      "pid": "0x0A0C",
 | 
			
		||||
      "device_version": "4.4.4"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
  "maintainer": "qmk",
 | 
			
		||||
  "usb": {
 | 
			
		||||
    "vid": "0x4025",
 | 
			
		||||
    "vid": "0x7574",
 | 
			
		||||
    "pid": "0x7574",
 | 
			
		||||
    "device_version": "0.0.1"
 | 
			
		||||
  },
 | 
			
		||||
  "layouts": {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user