Merge branch 'ofw_dev' into nfcrefactoring

2026-05-10 05:59:08 -07:00 · 2023-10-24 14:42:49 +03:00
parent ac5abdbb1d d92b0a82cc
commit 3bbb326c9c
512 changed files with 41484 additions and 68283 deletions
--- a/applications/services/desktop/scenes/desktop_scene_pin_timeout.c
+++ b/applications/services/desktop/scenes/desktop_scene_pin_timeout.c
@@ -1,7 +1,6 @@
 #include <furi.h>
 #include <FreeRTOS.h>
 #include <portmacro.h>
-#include <timer.h>
 #include <gui/scene_manager.h>

 #include "../desktop_i.h"