Commit b8d71d27 authored by bmortier's avatar bmortier

Merge branch 'cherry-pick-e60c6d5c' into '1.4'

Merge branch '31-code-of-conduct' into '1.4'

See merge request fusiondirectory/dev-manual!41
parents f319f665 dada7e75
.. _code-of-conduct-label:
Code of Conduct
===============
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment