Merge remote-tracking branch 'origin/master' into develop

40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866)

* 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8

* remove ortho_4x8 from Community Layouts rule

ortho_4x8 isn't a valid option here.

Merge remote-tracking branch 'origin/master' into develop

capsunlocked/cu7: fix missing key object (#13862)

Adds a key object for the encoder keypress.

Merge remote-tracking branch 'origin/master' into develop

[Docs] Remove extra word it bootmagic page (#13855)

Merge remote-tracking branch 'origin/master' into develop

0xCB Static: fix `qmk info` and Configurator issues (#13856)

Merge remote-tracking branch 'origin/master' into develop

Function96 V2: Fixed info.json file (#13322)

Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.

Merge remote-tracking branch 'origin/master' into develop

flash_stm32: don't unlock flash if already unlocked (#13841)

On stm32f4 after reboot from DFU it was observed that the flash is
already unlocked. In that case, attempting to unlock it again causes a
data abort.

Merge remote-tracking branch 'upstream/master' into develop

Fix alignment of USB out report buffer 2 -> 4 (#13838)

[BUG] Fix Key Override includes (#13831)

* [BUG] Fix Key Override includes

* simplify includes

fix develop branch move file (#13832)

Co-authored-by: zvecr <git@zvecr.com>

Duck Eagle/Viper V2 Refactor (#13828)

[Keyboard] Fix SRC include for matrix/m20add issi driver (#13826)

Merro60 Layout Macro Refactor (#13827)

Momoka Ergo: layout macro/Configurator fix (#13825)

* momoka_ergo.h: use modified QMK 3-character notation

Renames the matrix position arguments to use QMK's K<row><column> notation, but using L or R for the left and right halves, respectively.

* physically arrange layout macro

Arrange the layout macro and keycodes to resemble the assembled keyboard.

* info.json: rebuild LAYOUT data

Fixes mispositioned keys in QMK Configurator.