Commit graph

3 commits

Author SHA1 Message Date
James Young
55f699c09e
Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)
* Fix for #14622

Fix for a bad merge conflict resolution.
2021-09-28 17:18:53 -07:00
James Young
5917334b42
Merge remote-tracking branch 'upstream/master' into develop 2021-09-28 10:21:11 -07:00
mechlovin
fcb7c7b04f
[Keyboard] Add Adelais PCB. Adelais RGB rev.3, Adelais rev. 4 APM32F103, Adelais AVR rev. 1 (#14252)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-24 00:13:23 -07:00