From: TheOnePerson <a.nebinger@web.de>
Date: Thu, 18 May 2023 07:42:13 +0000 (+0200)
Subject: Merge branch 'main' into timer-face
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=7331851c7762cb1061f5c6d7c64593a1aa1fe7f8;p=sensor-watch.git

Merge branch 'main' into timer-face

# Conflicts:
#	movement/make/Makefile
#	movement/movement_faces.h
---

7331851c7762cb1061f5c6d7c64593a1aa1fe7f8