diff options
author | vantezzen <properly@protonmail.com> | 2019-09-13 18:08:29 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-09-13 18:08:29 +0200 |
commit | f5d17ec2348a12fb4b494bf79d0c52065493bd75 (patch) | |
tree | 2a8c6156dbd6f23c0f20cd0b1f9f0bcd6d1ee50f /CODE_OF_CONDUCT.md | |
parent | Merge Franz 5.3.2 (diff) | |
download | ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.tar.gz ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.tar.zst ferdium-app-f5d17ec2348a12fb4b494bf79d0c52065493bd75.zip |
Fix merge errors
Diffstat (limited to 'CODE_OF_CONDUCT.md')
0 files changed, 0 insertions, 0 deletions