Commit Graph

2 Commits

Author SHA1 Message Date
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
Riku Isokoski
52d1906589 Separate and update coding conventions and contributing pages 2021-11-28 13:42:37 +01:00