Skip to content

Commit 8d0afb5

Browse files
alexcjohnsonalexcjohnson
committed
Merge branch 'master' into lasso
2 parents 188a0db + 6ba33f5 commit 8d0afb5

File tree

204 files changed

+70976
-68169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+70976
-68169
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Plotly, Inc
3+
Copyright (c) 2016 Plotly, Inc
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 1 deletion

‎dist/plotly-geo-assets.js

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-with-meta.js

Lines changed: 35328 additions & 33964 deletions
Large diffs are not rendered by default.

‎dist/plotly.js

Lines changed: 35328 additions & 33964 deletions
Large diffs are not rendered by default.

‎dist/plotly.min.js

Lines changed: 38 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plotly.js",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "The open source javascript graphing library that powers plotly",
55
"license": "MIT",
66
"main": "./src/index.js",
@@ -84,6 +84,7 @@
8484
"browserify": "^12.0.1",
8585
"browserify-transform-tools": "^1.5.0",
8686
"ecstatic": "^1.2.0",
87+
"falafel": "^1.2.0",
8788
"glob": "^6.0.1",
8889
"jasmine-core": "^2.3.4",
8990
"jshint": "^2.8.0",

‎src/assets/geo_assets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2015, Plotly, Inc.
2+
* Copyright 2012-2016, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

‎src/components/annotations/arrow_paths.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2015, Plotly, Inc.
2+
* Copyright 2012-2016, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

0 commit comments

Comments
 (0)