Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev

scripts/fbt_tools/fbt_apps.py

@@ -127,7 +127,6 @@ def LoadAppManifest(env, entry):
 
         app_manifest_file_path = manifest_glob[0].rfile().abspath
         env["APPMGR"].load_manifest(app_manifest_file_path, entry)
-        env.Append(PY_LINT_SOURCES=[app_manifest_file_path])
     except FlipperManifestException as e:
         if not GetOption("silent"):
             warn(WarningOnByDefault, str(e))

scripts/fbt_tools/fbt_version.py

@@ -34,9 +34,9 @@ def generate(env):
                             "${ROOT_DIR}",
                             "--suffix",
                             "${DIST_SUFFIX}",
-                            "${VERSIONCOMSTR}",
                         ]
-                    ]
+                    ],
+                    "${VERSIONCOMSTR}",
                 ),
                 emitter=_version_emitter,
             ),