Merging latest development

Signed-off-by: Tommy Walton <waltont@amazon.com>
This commit is contained in:
Tommy Walton
2021-11-16 13:38:57 -08:00
38 changed files with 549 additions and 222 deletions
+1 -1
View File
@@ -125,7 +125,7 @@
</size>
</property>
<property name="text">
<string>Stable 21.11</string>
<string>development</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
+1 -1
View File
@@ -103,7 +103,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Stable 21.11</string>
<string>development</string>
</property>
</widget>
</item>