Merge remote-tracking branch 'origin/master' into albulank/module

Conflicts:
	package.json
This commit is contained in:
Alex Bulankou 2016-05-29 23:56:50 -07:00
Родитель b1a1919039 c7f34e4c79
Коммит d85fe75b23
4 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -90,12 +90,12 @@
-->
<SemanticVersionMajor>0</SemanticVersionMajor>
<SemanticVersionMinor>22</SemanticVersionMinor>
<SemanticVersionPatch>15</SemanticVersionPatch>
<SemanticVersionPatch>16</SemanticVersionPatch>
<!--
Date when Semantic Version was changed.
Update for every public release.
-->
<SemanticVersionDate>2016-05-23</SemanticVersionDate>
<SemanticVersionDate>2016-05-26</SemanticVersionDate>
<!--
Pre-release version is used to distinguish internally built NuGet packages.
Pre-release version = Minutes since semantic version was set, divided by 5 (to make it fit in a UInt16).

Просмотреть файл

@ -14,7 +14,7 @@ module Microsoft.ApplicationInsights {
"use strict";
export var Version = "0.22.15";
export var Version = "0.22.16";
/**
* Internal interface to pass appInsights object to subcomponents without coupling

Просмотреть файл

@ -1,7 +1,7 @@
{
"name": "applicationinsights-js",
"main": "dist/ai.0.js",
"version": "0.22.15",
"version": "0.22.16",
"homepage": "https://github.com/Microsoft/ApplicationInsights-JS",
"authors": [
"Max Shekhovtsov <mashekho@microsoft.com>"

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "applicationinsights-js",
"version": "0.22.15",
"version": "0.22.16",
"description": "Microsoft Application Insights JavaScript SDK",
"main": "JavaScriptSDK/AppInsightsModule",
"keywords": [