Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7

# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-08-21 12:06:14 -04:00
2 changed files with 20 additions and 17 deletions

View File

@@ -51,6 +51,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed a bug where IcdCultureInfo would fail to load on Crestron 4-series processors
- Clarifying which culture failed to load when IcdCultureInfo throws an exception
## [11.1.1] - 2020-08-21
### Removed
- Removed the OnItemTrimmed event from the ScrollQueue due to deadlocks
## [11.1.0] - 2020-05-19
### Added
- ScrollQueue - Added OnItemTrimmed event