Merge pull request #383 from Microsoft/develop

merge develop to master
microsoft · Nov 30, 2016 · 78acd3c · 78acd3c
2 parents 1413978 + 085f3d9
commit 78acd3c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This changelog will be used to generate documentation on [release notes page](ht
 ## Version 2.2.0-beta6
 - Added serialization of the "source" property.
 - Downgraded package dependencies to Microsoft.NETCore.App 1.0.1 level.
+- [Fixed the priority of getting an iKey from an environment variable](https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/236)
 
 ## Version 2.2.0-beta5
 - Moved from PCL dotnet5.4 to .NET Core NetStandard1.5.