Jean-François Milants bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp
2022-01-04 21:48:08 +01:00
..
2021-12-10 01:18:57 +00:00
2021-08-18 15:23:30 +03:00
2021-07-07 15:47:47 +03:00
2021-10-25 13:40:43 +03:00
2020-11-16 01:35:45 +01:00
2021-09-16 16:12:20 -04:00
2021-12-09 21:14:16 +01:00
2021-11-15 22:02:49 +01:00