Jean-François Milants 298f0f4335 Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes
# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h
2021-11-28 13:53:03 +01:00
..
2021-11-28 13:42:37 +01:00
2021-11-28 13:42:37 +01:00
2021-08-15 11:19:47 +02:00
2021-11-28 13:42:37 +01:00
2021-01-19 11:07:47 -08:00
2020-07-22 15:33:57 -07:00
2021-11-28 13:42:37 +01:00
2021-11-28 13:42:37 +01:00