Jean-François Milants ada2c09581 Merge branch 'develop' into infineat-external-resources
# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h
2022-09-11 14:59:49 +02:00
..
2022-06-06 17:47:43 +02:00
2022-06-05 09:15:46 +03:00
2022-01-04 02:00:03 +00:00
2022-06-06 17:47:43 +02:00