diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 16:16:51 +0100 |
commit | cdb9d5686841d82c5dd0623f223de55dd0fc94d0 (patch) | |
tree | b6a8fb58a59ef3387e555690d2e83817b95033c7 /.editorconfig | |
parent | Merge branch 'develop' into feature/mute-service (diff) | |
download | ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.gz ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.tar.zst ferdium-app-cdb9d5686841d82c5dd0623f223de55dd0fc94d0.zip |
fix merging issues
Diffstat (limited to '.editorconfig')
0 files changed, 0 insertions, 0 deletions