5 Commits

Author	SHA1	Message	Date
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	2021-06-28 19:09:20 -07:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
mnaumov	b315c13488	[LYN-4544] Fixing thumbnail crashing on bad data	2021-06-16 20:26:04 -07:00
mnaumov	ce367b4383	Fixing missing asset crashing Editor	2021-04-29 21:57:34 -07:00
alexpete	c2cbd430fe	Integrating up through commit 90f050496	2021-04-07 14:03:29 -07:00