Merge branch 'master' into release

This commit is contained in:
Matt Mazzola 2016-08-31 12:59:15 -07:00
Родитель a1e096a49b deab3ee002
Коммит b31743a381
3 изменённых файлов: 3 добавлений и 4 удалений

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

@ -1,8 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- node - node
after_success:
- ".travis/push.sh"
branches: branches:
except: except:
- "/^build-[0-9a-z\\-]*/" - "/^build-[0-9a-z\\-]*/"

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

@ -6,7 +6,7 @@
<authors>Microsoft</authors> <authors>Microsoft</authors>
<owners>microsoft,powerbi</owners> <owners>microsoft,powerbi</owners>
<licenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</licenseUrl> <licenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/Microsoft/PowerBI-CSharp</projectUrl> <projectUrl>https://github.com/Microsoft/PowerBI-JavaScript</projectUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkId=780675</iconUrl> <iconUrl>http://go.microsoft.com/fwlink/?LinkId=780675</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance> <requireLicenseAcceptance>true</requireLicenseAcceptance>
<summary>JavaScript web components for Power BI</summary> <summary>JavaScript web components for Power BI</summary>
@ -17,6 +17,7 @@
<files> <files>
<file src="dist\powerbi.js" target="content\scripts" /> <file src="dist\powerbi.js" target="content\scripts" />
<file src="dist\powerbi.min.js" target="content\scripts" /> <file src="dist\powerbi.min.js" target="content\scripts" />
<file src="dist\powerbi.js.map" target="content\scripts" />
<file src="dist\powerbi.d.ts" target="content\scripts\typings" /> <file src="dist\powerbi.d.ts" target="content\scripts\typings" />
</files> </files>
</package> </package>

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

@ -1,7 +1,7 @@
{ {
"name": "powerbi-client", "name": "powerbi-client",
"description": "", "description": "",
"main": "./dist/powerbi.min.js", "main": "./dist/powerbi.js",
"authors": [ "authors": [
"Microsoft" "Microsoft"
], ],