Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Presman committed Mar 24, 2017
2 parents 0b51813 + f9f8e5f commit 48621e4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
31 changes: 26 additions & 5 deletions .pubnub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ changelog:
changes:
- type: improvement
text: bump version after v3 release.
- version: v4.3.3
date:
changes:
- type: improvement
text: bump version after v3 release.
- version: v4.3.2
date:
changes:
Expand Down Expand Up @@ -199,6 +194,7 @@ changelog:
features:
access:
- ACCESS-GRANT
- ACCESS-SECRET-KEY-ALL-ACCESS
channel-groups:
- CHANNEL-GROUPS-ADD-CHANNELS
- CHANNEL-GROUPS-REMOVE-CHANNELS
Expand Down Expand Up @@ -243,3 +239,28 @@ features:
- SUBSCRIBE-WILDCARD
- SUBSCRIBE-FILTER-EXPRESSION
- SUBSCRIBE-PUBLISHER-UUID
supported-platforms:
-
version: Pubnub Javascript for Web
platforms:
- Safari 10 and up
- Mozilla Firefox 51 and up
- Google Chrome 56 and up
- Opera 41 and up
- IE 11 and up
- Microsoft Edge 38 and up
frameworks:
- Angular 1
- Angular 2 using Javascript Plain
-
version: Pubnub Javascript for Node
platforms:
- OSX 10.12 and up
- Ubuntu 14.04 and above
- Windows 7, 8, 10
editors:
- 0.12
- 4
- 5
- 6
- 7
10 changes: 0 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@



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


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


- ⭐bump version after v3 release.



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


Expand Down

0 comments on commit 48621e4

Please sign in to comment.