Merge branch 'master' into release

jfavlam · Aug 31, 2016 · b31743a · b31743a
2 parents a1e096a + deab3ee
commit b31743a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 node_js:
 - node
-after_success:
-- ".travis/push.sh"
 branches:
   except:
   - "/^build-[0-9a-z\\-]*/"

diff --git a/PowerBI.JavaScript.nuspec b/PowerBI.JavaScript.nuspec
@@ -6,7 +6,7 @@
     <authors>Microsoft</authors>
     <owners>microsoft,powerbi</owners>
     <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>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <summary>JavaScript web components for Power BI</summary>
@@ -17,6 +17,7 @@
   <files>
     <file src="dist\powerbi.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" />
   </files>
 </package>
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "powerbi-client",
   "description": "",
-  "main": "./dist/powerbi.min.js",
+  "main": "./dist/powerbi.js",
   "authors": [
     "Microsoft"
   ],