Merge pull request #992 from plotly/bump_pjs_1360

update pjs to version 1.36.0

Author: cldougl

Diff for: CHANGELOG.md

@@ -2,9 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.5.2] - UNRELEASED
+## [2.6.0] - 2018-05-02
 ### Updated
-- error message for `plotly.figure_factory.create_choropleth` is more helpful for Windows users on installing `geopandas` and dependencies including `shapely`.
+- Updated `plotly.min.js` to version 1.37.0.
+  - New features include a `splom` (scatter plot matrix) trace type.
+  - See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1370----2018-05-01) for additional information regarding the updates.
+- Error message for `plotly.figure_factory.create_choropleth` is more helpful for Windows users on installing `geopandas` and dependencies including `shapely`.
 
 ## [2.5.1] - 2018-03-26
 ### Fixed

Diff for: plotly/package_data/plotly.min.js

@@ -1 +1 @@
-__version__ = '2.5.1'
+__version__ = '2.6.0'