Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> # Conflicts: # scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
parent 57f5e6b2fb 448469025b
commit e9270e491a
50 changed files with 937 additions and 414 deletions
@@ -6,7 +6,7 @@
  "type": "Tool",
  "summary": "The Script Canvas Gem provides Open 3D Engine's visual scripting environment, Script Canvas.",
  "canonical_tags": ["Gem"],
-  "user_tags": ["Scripting", "Tools", "Utiltiy"],
+  "user_tags": ["Scripting", "Tools", "Utility"],
  "icon_path": "preview.png",
  "requirements": ""
 }