diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
| commit | 522a1eb0beaabb607b1f123993ec2f09be8a775b (patch) | |
| tree | 419bfe41495e6a2e56334db41990ba2fb6d33f16 /src/displayapp/icons/navigation/merge-straight.png | |
| parent | a0f2fa8469f3a2c0f5f2f914ad174029da321cc0 (diff) | |
Merge branch piggz/nav into develop:
- fix conflict
- add a icon for the navigation app.
Diffstat (limited to 'src/displayapp/icons/navigation/merge-straight.png')
| -rw-r--r-- | src/displayapp/icons/navigation/merge-straight.png | bin | 0 -> 961 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/displayapp/icons/navigation/merge-straight.png b/src/displayapp/icons/navigation/merge-straight.png Binary files differnew file mode 100644 index 00000000..e86ce174 --- /dev/null +++ b/src/displayapp/icons/navigation/merge-straight.png |