Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 64 insertions, 0 deletions

diff --git a/src/displayapp/icons/navigation/unique/merge_left.svg b/src/displayapp/icons/navigation/unique/merge_left.svg
new file mode 100644
index 00000000..6cfb14c4
--- /dev/null
+++ b/src/displayapp/icons/navigation/unique/merge_left.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="WORKING_ICONS"
+   data-name="WORKING ICONS"
+   width="20"
+   height="19.966091"
+   viewBox="0 0 20 19.966091"
+   version="1.1"
+   sodipodi:docname="merge_left.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>direction</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="21.5"
+     inkscape:cx="8.9790409"
+     inkscape:cy="15.078787"
+     inkscape:window-x="-8"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="WORKING_ICONS" />
+  <title
+     id="title2">direction</title>
+  <path
+     fill="#000000"
+     d="M 7.26501,6.4819849 V 19.344974 A 0.37181176,0.37181176 0 0 1 6.8936103,19.716386 H 5.6387643 A 0.37181176,0.37181176 0 0 1 5.2673646,19.344974 V 6.4819849 H 7.26501 M 7.5147157,6.2322792 H 5.0176589 V 19.344974 a 0.62110542,0.62110542 0 0 0 0.6211054,0.621118 h 1.254846 A 0.62110542,0.62110542 0 0 0 7.5147157,19.344974 Z M 7.4918552,9.977864 V 7.4963518 A 0.44647376,0.44647376 0 0 1 8.1691564,7.0251821 L 11.854601,8.702892 A 0.48266859,0.48266859 0 0 0 12.365774,7.9243848 L 6.2661873,0 0.12093057,7.9244098 A 0.48266859,0.48266859 0 0 0 0.63210307,8.702917 L 4.3175716,7.0251821 A 0.4464363,0.4464363 0 0 1 4.9947984,7.4963518 V 9.977864 h -0.00228 l 0.00228,0.01373 a 7.5663193,7.5663193 0 0 0 7.5826136,7.477437 h 4.925532 v -0.0039 l 1.87675,0.0025 A 0.61944488,0.61944488 0 0 0 20,16.848111 V 15.591523 A 0.61954476,0.61954476 0 0 0 19.380456,14.971978 H 12.577412 A 5.0663035,5.0663035 0 0 1 7.4918552,9.991885 Z"
+     id="path4"
+     style="stroke-width:1.24853" />
+</svg>