Merge branch stabilization/2110 into development

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-04 13:44:22 -07:00
parent 5a0b5f9f8b 4721ef8298
commit d942c90c56
118 changed files with 285 additions and 68 deletions
@@ -2,6 +2,7 @@
    "gem_name": "AtomViewportDisplayInfo",
    "display_name": "Atom Viewport Display Info",
    "license": "Apache-2.0 Or MIT",
+    "license_url": "https://github.com/o3de/o3de/blob/development/LICENSE.txt",
    "origin": "Open 3D Engine - o3de.org",
    "type": "Code",
    "summary": "",