Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de

Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
parent 512fbbe6b2 bf8897551f
commit d9ec159f0e
50 changed files with 937 additions and 414 deletions
@@ -6,7 +6,7 @@
    "type": "Code",
    "summary": "The Game State Samples Gem provides a set of sample game states (built on top of the Game State Gem), including primary user selection, main menu, level loading, level running, and level paused.",
    "canonical_tags": ["Gem"],
-    "user_tags": ["Gameplay", "Samples", "Assets"],
+    "user_tags": ["Gameplay", "Sample", "Assets"],
    "icon_path": "preview.png",
    "requirements": ""
 }