diff options
| author | hathach <[email protected]> | 2025-06-16 11:08:01 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-06-16 11:08:01 +0700 |
| commit | 4a44dd5c471578ee5b957a75adaf3dbc6a48241a (patch) | |
| tree | 0508b6721f1cf4c74964412a894d6c65edba3afb /docs/contributing/code_of_conduct.rst | |
| parent | f00e698ae2a470d749331361ef0b031af96cdbd6 (diff) | |
| parent | e95973d3462cdacd165a4057632d46248ded7b8a (diff) | |
Merge branch 'master' into fork/IngHK/cdch_upgrade
# Conflicts:
# README.rst
# docs/reference/index.rst
# src/class/cdc/cdc_device.c
# src/class/cdc/cdc_host.c
Diffstat (limited to 'docs/contributing/code_of_conduct.rst')
| -rw-r--r--[l---------] | docs/contributing/code_of_conduct.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/contributing/code_of_conduct.rst b/docs/contributing/code_of_conduct.rst index b52bf14c5..fb1859c75 120000..100644 --- a/docs/contributing/code_of_conduct.rst +++ b/docs/contributing/code_of_conduct.rst @@ -1 +1 @@ -../../CODE_OF_CONDUCT.rst
\ No newline at end of file +.. include:: ../../CODE_OF_CONDUCT.rst
\ No newline at end of file |