diff options
| author |  vantezzen <hello@vantezzen.io> | 2020-02-26 09:55:56 +0100 |
|---|---|---|
| committer | vantezzen <hello@vantezzen.io> | 2020-02-26 09:55:56 +0100 |
| commit | 5246c77d86cc775e83f011386ba3110362aaa3ba (patch) | |
| tree | 2df0d09b19a5f7fc403db10b02c7a6d4fe009829 /package.json | |
| parent | Merge branch 'develop' into feat/#270 (diff) | |
| download | ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.tar.gz ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.tar.zst ferdium-app-5246c77d86cc775e83f011386ba3110362aaa3ba.zip | |
Fix merge errors
Diffstat (limited to 'package.json')
0 files changed, 0 insertions, 0 deletions