Merge branch 'main' into local-solar-time

diff --cc movement_faces.h
index cf940da494aca7bbea693cc5501c4a3af0553c65,8419702c894b74da8ce34c8445a3bc53216069b5..ca9d90da8ddb37a5a4d6cab1aa3557a793875680
--- 1/movement_faces.h
--- 2/movement_faces.h
+++ b/movement_faces.h
@@@ -80,5 -80,5 +80,6 @@@
  #include "simon_face.h"
  #include "ping_face.h"
  #include "rtccount_face.h"
+ #include "tomato_face.h"
 +#include "solar_time_face.h"
  // New includes go above this line.

diff --cc watch-faces.mk
index 95bd22ad7ca4a5ae19d16111dd8a11083f397b0d,dd9c7f365963708713595da6ca5c062d1c893aaa..e87e8a6130877557bd6b6023bf552fd0c350e60e
--- 1/watch-faces.mk
--- 2/watch-faces.mk
+++ b/watch-faces.mk
@@@ -55,5 -55,5 +55,6 @@@ SRCS += 
    ./watch-faces/complication/lander_face.c \
    ./watch-faces/complication/simon_face.c \
    ./watch-faces/complication/ping_face.c \
+   ./watch-faces/complication/tomato_face.c \
 +  ./watch-faces/clock/solar_time_face.c \
  # New watch faces go above this line.