Conflicts: templates/f7/Inc/main.h templates/f7/Makefile templates/f7/Src/main.c templates/f7/f7.ioc templates/f7/middleware.py
Merge branch 'master' · 75c36bef