Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ManuelFernando committed Mar 30, 2017
2 parents eb17335 + cad982a commit 7292f96
Show file tree
Hide file tree
Showing 34 changed files with 5,420 additions and 211 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.DS_Store
node_modules
resources/titanium
resources/__MACOSX
javascript.iml
*.js-e
*.json-e
Expand All @@ -8,3 +10,4 @@ coverage/
.idea
*.iml
dist/web/stats.json
dist/titanium/stats.json
11 changes: 10 additions & 1 deletion .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
name: javascript
version: 4.6.0
version: 4.6.1
schema: 1
scm: github.com/pubnub/javascript
files:
- dist/web/pubnub.js
- dist/web/pubnub.min.js
changelog:
- version: v4.6.1
date:
changes:
- type: feature
text: add support for titanium SDK
- type: improvement
text: fix support for react-native SDK
- type: improvement
text: add validation for web distribution
- version: v4.6.0
date:
changes:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## [v4.6.1](https://github.com/pubnub/javascript/tree/v4.6.1)


[Full Changelog](https://github.com/pubnub/javascript/compare/v4.6.0...v4.6.1)

- 🌟add support for titanium SDK

- 🌟fix issue with React-Native SDK

- 🌟Validate web distribution




## [v4.6.0](https://github.com/pubnub/javascript/tree/v4.6.0)

Expand Down
Loading

0 comments on commit 7292f96

Please sign in to comment.