Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						8606e78920
					
				
					 2 changed files with 2 additions and 0 deletions
				
			
		| 
						 | 
					@ -22,6 +22,7 @@
 | 
				
			||||||
    "processor": "STM32F303",
 | 
					    "processor": "STM32F303",
 | 
				
			||||||
    "bootloader": "stm32-dfu",
 | 
					    "bootloader": "stm32-dfu",
 | 
				
			||||||
    "board": "QMK_PROTON_C",
 | 
					    "board": "QMK_PROTON_C",
 | 
				
			||||||
 | 
					    "community_layouts": ["tkl_f13_ansi_tsangan"],
 | 
				
			||||||
    "layout_aliases": {
 | 
					    "layout_aliases": {
 | 
				
			||||||
        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
 | 
					        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -80,6 +80,7 @@
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "processor": "STM32F072",
 | 
					    "processor": "STM32F072",
 | 
				
			||||||
    "bootloader": "stm32-dfu",
 | 
					    "bootloader": "stm32-dfu",
 | 
				
			||||||
 | 
					    "community_layouts": ["tkl_f13_ansi_tsangan"],
 | 
				
			||||||
    "layout_aliases": {
 | 
					    "layout_aliases": {
 | 
				
			||||||
        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
 | 
					        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue