diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:56 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-22 17:15:56 +0100 |
commit | 9f0a77af747060a42bd8789672fb2f2a870636d8 (patch) | |
tree | cb242d6c8b1c6b875b98bf04a751bcdc7202ce3a /src/styles/input.scss | |
parent | merge-in latest develop (diff) | |
download | ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.tar.gz ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.tar.zst ferdium-app-9f0a77af747060a42bd8789672fb2f2a870636d8.zip |
fix merge conflict
Diffstat (limited to 'src/styles/input.scss')
0 files changed, 0 insertions, 0 deletions