Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
metagrover committed Oct 31, 2017
2 parents 057725a + 3c2c54f commit 5cc7297
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion dist/CustomQuery.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/GeoDistanceDropdown.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/GeoDistanceSlider.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/PlacesSearch.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/direction.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/earthquake.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/events.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/heatmap.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/list.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/meetupblast.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/nearby.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/now.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/transport.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/weather.bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appbaseio/reactivemaps",
"version": "1.4.1",
"version": "1.4.2",
"description": "Data Components for building map UIs",
"main": "lib/app.js",
"scripts": {
Expand All @@ -25,7 +25,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@appbaseio/reactivebase": "1.4.1",
"@appbaseio/reactivebase": "1.4.2",
"axios": "^0.15.2",
"classnames": "^2.2.5",
"google-map-react": "^0.14.5",
Expand Down
2 changes: 1 addition & 1 deletion playground/iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<body>
<div id="root"></div>
<div id="error-display"></div>
<script src="static/preview.28cb69e10bfc0c67ae3b.bundle.js"></script>
<script src="static/preview.06b64fe8ca7d720f7050.bundle.js"></script>
</body>
</html>

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion umd/reactivemaps.js

Large diffs are not rendered by default.

Binary file modified umd/reactivemaps.js.br
Binary file not shown.
Binary file modified umd/reactivemaps.js.gzip
Binary file not shown.
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
grunt "~0.4.0"
serve-static "^1.10.2"

"@appbaseio/[email protected].1":
version "1.4.1"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.4.1.tgz#46d6b2213a0f9a384356eb8d893f48c1ed4239e6"
"@appbaseio/[email protected].2":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.4.2.tgz#50216a4203f7558df9b7cd6ff41e3fc477c5a626"
dependencies:
appbase-js "^2.1.0"
classnames "^2.2.5"
Expand Down

0 comments on commit 5cc7297

Please sign in to comment.