about summary refs log tree commit diff
path: root/CODE_OF_CONDUCT.md
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-06-17 17:10:15 +0200
committerThibaut Girka <thib@sitedethib.com>2020-06-17 17:10:15 +0200
commit59e92004b3aa8543a42f1bd40d32f936177a434d (patch)
treed952a82dc15cc16bda626d60dd0162c25bb125b4 /CODE_OF_CONDUCT.md
parent0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (diff)
parentb1d492f30a584a9e204ac1345e6508ed4acb44bd (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
Diffstat (limited to 'CODE_OF_CONDUCT.md')
0 files changed, 0 insertions, 0 deletions