Merge branch piggz/nav into develop:

Browse Source

- fix conflict
 - add a icon for the navigation app.

...

This commit is contained in:

Jean-François Milants

2021-01-20 21:34:09 +01:00

parent a0f2fa8469

commit 522a1eb0be

280 changed files with 10934 additions and 384 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/displayapp/icons/navigation/fork-straight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB