diff options
| author | hathach <[email protected]> | 2025-11-19 11:32:44 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-11-19 11:32:44 +0700 |
| commit | fd3161087d76c84fb21e8e2f2d30a81d6b11bfba (patch) | |
| tree | 527172cad87c76062490e4ecc9277e21d3691224 /docs/contributing/code_of_conduct.rst | |
| parent | be4b38c54dc4e23af322ae04eda1f30e5ced0289 (diff) | |
| parent | d46f71bdde8b3160b0efaf83598d6b4cf596f787 (diff) | |
Merge branch 'refs/heads/master' into dwc2_ep0
# Conflicts:
# examples/device/dfu/src/usb_descriptors.c
# examples/device/dfu_runtime/src/usb_descriptors.c
# src/device/usbd_control.c
# src/portable/synopsys/dwc2/dcd_dwc2.c
Diffstat (limited to 'docs/contributing/code_of_conduct.rst')
| -rw-r--r-- | docs/contributing/code_of_conduct.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/contributing/code_of_conduct.rst b/docs/contributing/code_of_conduct.rst deleted file mode 100644 index fb1859c75..000000000 --- a/docs/contributing/code_of_conduct.rst +++ /dev/null @@ -1 +0,0 @@ -.. include:: ../../CODE_OF_CONDUCT.rst
\ No newline at end of file |