diff options
author | 2019-10-09 10:04:18 +0200 | |
---|---|---|
committer | 2019-10-09 10:04:18 +0200 | |
commit | 6898419473197f4ac76facc18b2b33fcd0b90c44 (patch) | |
tree | 0297406851ab942c9d15869023951072998c14fb /README.md | |
parent | Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.4.0 (diff) | |
download | ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.tar.gz ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.tar.zst ferdium-app-6898419473197f4ac76facc18b2b33fcd0b90c44.zip |
Fix merge errors
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions