summaryrefslogtreecommitdiff
path: root/docs/contributing/code_of_conduct.rst
diff options
context:
space:
mode:
authorhathach <[email protected]>2025-04-18 17:54:01 +0700
committerhathach <[email protected]>2025-04-18 17:59:38 +0700
commit2fd0301f0ef0df058de4004d045eb0ea4209a2e9 (patch)
tree65182d57fb57766a36ff0e09057254df308a40d0 /docs/contributing/code_of_conduct.rst
parent925010fd841c5442579c503a3b1aa211cc25e8b2 (diff)
parente44f556a951451fd9123cb822683faac324e0450 (diff)
Merge branch 'master' into fork/HiFiPhile/ping_out
# Conflicts: # src/portable/synopsys/dwc2/hcd_dwc2.c
Diffstat (limited to 'docs/contributing/code_of_conduct.rst')
-rw-r--r--[l---------]docs/contributing/code_of_conduct.rst0
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/contributing/code_of_conduct.rst b/docs/contributing/code_of_conduct.rst
index fb1859c75..fb1859c75 120000..100644
--- a/docs/contributing/code_of_conduct.rst
+++ b/docs/contributing/code_of_conduct.rst