From 522a1eb0beaabb607b1f123993ec2f09be8a775b Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Wed, 20 Jan 2021 21:34:09 +0100 Subject: Merge branch piggz/nav into develop: - fix conflict - add a icon for the navigation app. --- src/displayapp/icons/navigation/fork-straight.png | Bin 0 -> 1652 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/displayapp/icons/navigation/fork-straight.png (limited to 'src/displayapp/icons/navigation/fork-straight.png') diff --git a/src/displayapp/icons/navigation/fork-straight.png b/src/displayapp/icons/navigation/fork-straight.png new file mode 100644 index 00000000..f0f5a7d6 Binary files /dev/null and b/src/displayapp/icons/navigation/fork-straight.png differ -- cgit v1.2.3