Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						95cbcef34f
					
				
					 4 changed files with 4 additions and 4 deletions
				
			
		|  | @ -1,4 +1,4 @@ | |||
| /* Copyright 2019 Jeremy Bernhardt
 | ||||
| /* Copyright 2019 Jane Bernhardt
 | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  |  | |||
|  | @ -4,7 +4,7 @@ | |||
| 
 | ||||
| It's a Taco with a side of HASL. A 12 key fiesta of a board. | ||||
| 
 | ||||
| Keyboard Maintainer: [Jeremy Bernhardt](https://github.com/germ)   | ||||
| Keyboard Maintainer: [Jane Bernhardt](https://github.com/germ)   | ||||
| Hardware Supported: ErgoTaco   | ||||
| Hardware Availability: [gboards.ca](http://gboards.ca)   | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ A compact 20% (12x2) Split Keyboard for steno and QWERTY. | |||
| 
 | ||||
| [More info on qmk.fm](http://qmk.fm/georgi/) | ||||
| 
 | ||||
| Keyboard Maintainer: [Jeremy Bernhardt](https://github.com/germ)   | ||||
| Keyboard Maintainer: [Jane Bernhardt](https://github.com/germ)   | ||||
| Hardware Supported: Georgi    | ||||
| Hardware Availability: [gboards.ca](http://gboards.ca)   | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ A compact 50% (14x4) Split Keyboard compatible with i2c modules and a trackball. | |||
| 
 | ||||
| [More info on qmk.fm](http://qmk.fm/gergo/) | ||||
| 
 | ||||
| Keyboard Maintainer: [Jeremy Bernhardt](https://github.com/germ)   | ||||
| Keyboard Maintainer: [Jane Bernhardt](https://github.com/germ)   | ||||
| Hardware Supported: Gergo (Kit, Partial, Ready)    | ||||
| Hardware Availability: [gboards.ca](http://gboards.ca)   | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot