diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-02-13 11:23:05 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-02-13 11:23:05 +0100 |
| commit | 87d882b151acc7ef60fdb1a957649faf39e737c1 (patch) | |
| tree | 7d7586810c062d8fac37f16f208f6da77757a3ba /src/displayapp/icons/navigation/unique/ferry.svg | |
| parent | d967efa19710f85cee846c59adbbe07d2a2189dc (diff) | |
| parent | 947ece0bc9ad90dd4c1fcd5875594a4a48eddd56 (diff) | |
Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat
# Conflicts:
# src/components/datetime/DateTimeController.cpp
Diffstat (limited to 'src/displayapp/icons/navigation/unique/ferry.svg')
0 files changed, 0 insertions, 0 deletions