Merge branch 'master' into develop

Conflicts: HockeySDK.sln HockeySDK_WP75/Controls/NotificationBox/NotificationBox.cs HockeySDK_WP75/Controls/NotificationBox/NotificationBoxItem.cs HockeySDK_WP75/CrashHandler.cs HockeySDK_WP8/Properties/AssemblyInfo.cs HockeySDK_WP8/Themes/Generic.xaml HockeySDK_WP8/Tools/NotificationAction.cs HockeySDK_WP8/Tools/NotificationTool.cs README.md
codenauts · Dec 13, 2013 · 64bb8df · 64bb8df
2 parents 9aae587 + 610bd9e
commit 64bb8df
Show file tree

Hide file tree

Showing 391 changed files with 1 addition and 154,899 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/Files/HockeySDK-1.0.1-WP7.zip b/Files/HockeySDK-1.0.1-WP7.zip
diff --git a/Files/HockeySDK-1.1.0-WP8.zip b/Files/HockeySDK-1.1.0-WP8.zip
diff --git a/HockeyApp.1.1.0.1.nupkg b/HockeyApp.1.1.0.1.nupkg
diff --git a/HockeySDK.sln b/HockeySDK.sln
diff --git a/HockeySDK_Portable/Exceptions/WebTransferException.cs b/HockeySDK_Portable/Exceptions/WebTransferException.cs
diff --git a/HockeySDK_Portable/Extensions/ExceptionExtension.cs b/HockeySDK_Portable/Extensions/ExceptionExtension.cs
diff --git a/HockeySDK_Portable/Extensions/UtilExtensions.cs b/HockeySDK_Portable/Extensions/UtilExtensions.cs